/*
* MPEG2 transport stream (aka DVB) muxer
- * Copyright (c) 2003 Fabrice Bellard.
+ * Copyright (c) 2003 Fabrice Bellard
*
* This file is part of FFmpeg.
*
#include "libavutil/bswap.h"
#include "libavutil/crc.h"
+#include "libavcodec/mpegvideo.h"
#include "avformat.h"
#include "mpegts.h"
for(i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
MpegTSWriteStream *ts_st = st->priv_data;
+ AVMetadataTag *lang = av_metadata_get(st->metadata, "language", NULL,0);
switch(st->codec->codec_id) {
case CODEC_ID_MPEG1VIDEO:
case CODEC_ID_MPEG2VIDEO:
/* write optional descriptors here */
switch(st->codec->codec_type) {
case CODEC_TYPE_AUDIO:
- if (strlen(st->language) == 3) {
+ if (lang && strlen(lang->value) == 3) {
*q++ = 0x0a; /* ISO 639 language descriptor */
*q++ = 4;
- *q++ = st->language[0];
- *q++ = st->language[1];
- *q++ = st->language[2];
+ *q++ = lang->value[0];
+ *q++ = lang->value[1];
+ *q++ = lang->value[2];
*q++ = 0; /* undefined type */
}
break;
case CODEC_TYPE_SUBTITLE:
{
const char *language;
- language = st->language;
- if (strlen(language) != 3)
- language = "eng";
+ language = lang && strlen(lang->value)==3 ? lang->value : "eng";
*q++ = 0x59;
*q++ = 8;
*q++ = language[0];
MpegTSWriteStream *ts_st;
MpegTSService *service;
AVStream *st;
+ AVMetadataTag *title;
int i, total_bit_rate;
const char *service_name;
+ uint64_t sdt_size, pat_pmt_size, pos;
ts->tsid = DEFAULT_TSID;
ts->onid = DEFAULT_ONID;
/* allocate a single DVB service */
- service_name = s->title;
- if (service_name[0] == '\0')
- service_name = DEFAULT_SERVICE_NAME;
+ title = av_metadata_get(s->metadata, "title", NULL, 0);
+ service_name = title ? title->value : DEFAULT_SERVICE_NAME;
service = mpegts_add_service(ts, DEFAULT_SID,
DEFAULT_PROVIDER_NAME, service_name);
service->pmt.write_packet = section_write_packet;
(TS_PACKET_SIZE * 8 * 1000);
ts->pat_packet_freq = (total_bit_rate * PAT_RETRANS_TIME) /
(TS_PACKET_SIZE * 8 * 1000);
-#if 0
- printf("%d %d %d\n",
- total_bit_rate, ts->sdt_packet_freq, ts->pat_packet_freq);
-#endif
- ts->mux_rate = total_bit_rate;
+ ts->mux_rate = 1; // avoid div by 0
/* write info at the start of the file, so that it will be fast to
find them */
+ pos = url_ftell(s->pb);
mpegts_write_sdt(s);
+ sdt_size = url_ftell(s->pb) - pos;
+ pos = url_ftell(s->pb);
mpegts_write_pat(s);
for(i = 0; i < ts->nb_services; i++) {
mpegts_write_pmt(s, ts->services[i]);
}
+ pat_pmt_size = url_ftell(s->pb) - pos;
+
+ total_bit_rate +=
+ total_bit_rate * 25 / DEFAULT_PES_PAYLOAD_SIZE + /* PES header size */
+ total_bit_rate * 4 / TS_PACKET_SIZE + /* TS header size */
+ SDT_RETRANS_TIME * 8 * sdt_size / 1000 + /* SDT size */
+ PAT_RETRANS_TIME * 8 * pat_pmt_size / 1000 + /* PAT+PMT size */
+ PCR_RETRANS_TIME * 8 * 8 / 1000; /* PCR size */
+
+ av_log(s, AV_LOG_DEBUG, "muxrate %d freq sdt %d pat %d\n",
+ total_bit_rate, ts->sdt_packet_freq, ts->pat_packet_freq);
+
+ if (s->mux_rate)
+ ts->mux_rate = s->mux_rate;
+ else
+ ts->mux_rate = total_bit_rate;
+
+ // adjust pcr
+ ts->cur_pcr /= ts->mux_rate;
+
put_flush_packet(s->pb);
return 0;
if (write_pcr) {
// add 11, pcr references the last byte of program clock reference base
pcr = ts->cur_pcr + (4+7)*8*90000LL / ts->mux_rate;
+ if (dts != AV_NOPTS_VALUE && dts < pcr)
+ av_log(s, AV_LOG_WARNING, "dts < pcr, TS is invalid\n");
*q++ = 7; /* AFC length */
*q++ = 0x10; /* flags: PCR present */
*q++ = pcr >> 25;
header_len += 5;
flags |= 0x80;
}
- if (dts != AV_NOPTS_VALUE) {
+ if (dts != AV_NOPTS_VALUE && dts != pts) {
header_len += 5;
flags |= 0x40;
}
write_pts(q, flags >> 6, pts);
q += 5;
}
- if (dts != AV_NOPTS_VALUE) {
+ if (dts != AV_NOPTS_VALUE && dts != pts) {
write_pts(q, 1, dts);
q += 5;
}
AVStream *st = s->streams[pkt->stream_index];
int size= pkt->size;
uint8_t *buf= pkt->data;
+ uint8_t *data= NULL;
MpegTSWriteStream *ts_st = st->priv_data;
int len, max_payload_size;
+ const uint8_t *access_unit_index = NULL;
+ const uint64_t delay = av_rescale(s->max_delay, 90000, AV_TIME_BASE);
+ int64_t dts = AV_NOPTS_VALUE, pts = AV_NOPTS_VALUE;
+
+ if (pkt->pts != AV_NOPTS_VALUE)
+ pts = pkt->pts + delay;
+ if (pkt->dts != AV_NOPTS_VALUE)
+ dts = pkt->dts + delay;
if (st->codec->codec_type == CODEC_TYPE_SUBTITLE) {
/* for subtitle, a single PES packet must be generated */
- mpegts_write_pes(s, st, buf, size, pkt->pts, AV_NOPTS_VALUE);
+ mpegts_write_pes(s, st, buf, size, pts, AV_NOPTS_VALUE);
return 0;
}
if (st->codec->codec_id == CODEC_ID_DIRAC) {
/* for Dirac, a single PES packet must be generated */
- mpegts_write_pes(s, st, buf, size, pkt->pts, pkt->dts);
+ mpegts_write_pes(s, st, buf, size, pts, dts);
return 0;
}
max_payload_size = DEFAULT_PES_PAYLOAD_SIZE;
+ if (st->codec->codec_id == CODEC_ID_MPEG2VIDEO ||
+ st->codec->codec_id == CODEC_ID_MPEG1VIDEO) {
+ const uint8_t *p = pkt->data;
+ const uint8_t *end = pkt->data+pkt->size;
+ uint32_t state = -1;
+ while (p < end) {
+ p = ff_find_start_code(p, end, &state);
+ if (state == PICTURE_START_CODE) {
+ access_unit_index = p - 4;
+ break;
+ }
+ }
+ } if (st->codec->codec_id == CODEC_ID_H264) {
+ if (pkt->size < 5 || AV_RB32(pkt->data) != 0x0000001) {
+ av_log(s, AV_LOG_ERROR, "h264 bitstream malformated\n");
+ return -1;
+ }
+ if (pkt->data[4] != 0x09) { // AUD NAL
+ data = av_malloc(pkt->size+6);
+ if (!data)
+ return -1;
+ memcpy(data+6, pkt->data, pkt->size);
+ AV_WB32(data, 0x00000001);
+ data[4] = 0x09;
+ data[5] = 0xe0; // any slice type
+ buf = data;
+ size = pkt->size+6;
+ }
+ access_unit_index = buf;
+ } else {
+ access_unit_index = pkt->data;
+ }
+
+ if (!access_unit_index) {
+ av_log(s, AV_LOG_ERROR, "error, could not find access unit start\n");
+ return -1;
+ }
+
while (size > 0) {
len = max_payload_size - ts_st->payload_index;
if (len > size)
buf += len;
size -= len;
ts_st->payload_index += len;
- if (ts_st->payload_pts == AV_NOPTS_VALUE)
- ts_st->payload_pts = pkt->pts;
- if (ts_st->payload_dts == AV_NOPTS_VALUE)
- ts_st->payload_dts = pkt->dts;
+ if (access_unit_index && access_unit_index < buf &&
+ ts_st->payload_pts == AV_NOPTS_VALUE &&
+ ts_st->payload_dts == AV_NOPTS_VALUE) {
+ ts_st->payload_dts = dts;
+ ts_st->payload_pts = pts;
+ }
if (ts_st->payload_index >= max_payload_size) {
mpegts_write_pes(s, st, ts_st->payload, ts_st->payload_index,
ts_st->payload_pts, ts_st->payload_dts);
ts_st->payload_pts = AV_NOPTS_VALUE;
ts_st->payload_dts = AV_NOPTS_VALUE;
ts_st->payload_index = 0;
+ access_unit_index = NULL; // unset access unit to avoid setting pts/dts again
}
}
+
+ av_free(data);
+
return 0;
}