X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fmpegtsenc.c;h=26d2cb229fe2f605292d684775558288414f6d3d;hb=21a19b7912fe0622f3d1748ff102fcc7bc7a974a;hp=dc8916baa63f3eca3e2e2c6381aed1c64324dac2;hpb=b5931348bc0b9e94a4ba19a2b762c3ee6d5633dd;p=ffmpeg diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index dc8916baa63..26d2cb229fe 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1,28 +1,35 @@ /* * MPEG2 transport stream (aka DVB) muxer - * Copyright (c) 2003 Fabrice Bellard. + * Copyright (c) 2003 Fabrice Bellard * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "libavutil/bswap.h" #include "libavutil/crc.h" +#include "libavutil/dict.h" +#include "libavutil/opt.h" +#include "libavcodec/mpegvideo.h" #include "avformat.h" +#include "internal.h" #include "mpegts.h" +#include "adts.h" + +#define PCR_TIME_BASE 27000000 /* write DVB SI sections */ @@ -43,35 +50,63 @@ typedef struct MpegTSService { char *provider_name; int pcr_pid; int pcr_packet_count; - int pcr_packet_freq; + int pcr_packet_period; } MpegTSService; typedef struct MpegTSWrite { + const AVClass *av_class; MpegTSSection pat; /* MPEG2 pat table */ MpegTSSection sdt; /* MPEG2 sdt table context */ MpegTSService **services; int sdt_packet_count; - int sdt_packet_freq; + int sdt_packet_period; int pat_packet_count; - int pat_packet_freq; + int pat_packet_period; int nb_services; int onid; int tsid; - uint64_t cur_pcr; - int mux_rate; + int64_t first_pcr; + int mux_rate; ///< set to 1 when VBR + + int transport_stream_id; + int original_network_id; + int service_id; + + int pmt_start_pid; + int start_pid; } MpegTSWrite; +static const AVOption options[] = { + { "mpegts_transport_stream_id", "Set transport_stream_id field.", + offsetof(MpegTSWrite, transport_stream_id), FF_OPT_TYPE_INT, {.dbl = 0x0001 }, 0x0001, 0xffff, AV_OPT_FLAG_ENCODING_PARAM}, + { "mpegts_original_network_id", "Set original_network_id field.", + offsetof(MpegTSWrite, original_network_id), FF_OPT_TYPE_INT, {.dbl = 0x0001 }, 0x0001, 0xffff, AV_OPT_FLAG_ENCODING_PARAM}, + { "mpegts_service_id", "Set service_id field.", + offsetof(MpegTSWrite, service_id), FF_OPT_TYPE_INT, {.dbl = 0x0001 }, 0x0001, 0xffff, AV_OPT_FLAG_ENCODING_PARAM}, + { "mpegts_pmt_start_pid", "Set the first pid of the PMT.", + offsetof(MpegTSWrite, pmt_start_pid), FF_OPT_TYPE_INT, {.dbl = 0x1000 }, 0x1000, 0x1f00, AV_OPT_FLAG_ENCODING_PARAM}, + { "mpegts_start_pid", "Set the first pid.", + offsetof(MpegTSWrite, start_pid), FF_OPT_TYPE_INT, {.dbl = 0x0100 }, 0x0100, 0x0f00, AV_OPT_FLAG_ENCODING_PARAM}, + { NULL }, +}; + +static const AVClass mpegts_muxer_class = { + .class_name = "MPEGTS muxer", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + /* NOTE: 4 bytes must be left at the end for the crc32 */ static void mpegts_write_section(MpegTSSection *s, uint8_t *buf, int len) { - MpegTSWrite *ts = ((AVFormatContext*)s->opaque)->priv_data; unsigned int crc; unsigned char packet[TS_PACKET_SIZE]; const unsigned char *buf_ptr; unsigned char *q; int first, b, len1, left; - crc = bswap_32(av_crc(av_crc_get_table(AV_CRC_32_IEEE), -1, buf, len - 4)); + crc = av_bswap32(av_crc(av_crc_get_table(AV_CRC_32_IEEE), -1, buf, len - 4)); buf[len - 4] = (crc >> 24) & 0xff; buf[len - 3] = (crc >> 16) & 0xff; buf[len - 2] = (crc >> 8) & 0xff; @@ -88,8 +123,8 @@ static void mpegts_write_section(MpegTSSection *s, uint8_t *buf, int len) b |= 0x40; *q++ = b; *q++ = s->pid; - *q++ = 0x10 | s->cc; s->cc = (s->cc + 1) & 0xf; + *q++ = 0x10 | s->cc; if (first) *q++ = 0; /* 0 offset */ len1 = TS_PACKET_SIZE - (q - packet); @@ -106,8 +141,6 @@ static void mpegts_write_section(MpegTSSection *s, uint8_t *buf, int len) buf_ptr += len1; len -= len1; - - ts->cur_pcr += TS_PACKET_SIZE*8*90000LL/ts->mux_rate; } } @@ -126,6 +159,8 @@ static int mpegts_write_section1(MpegTSSection *s, int tid, int id, { uint8_t section[1024], *q; unsigned int tot_len; + /* reserved_future_use field must be set to 1 for SDT */ + unsigned int flags = tid == SDT_TID ? 0xf000 : 0xb000; tot_len = 3 + 5 + len + 4; /* check if not too big */ @@ -134,7 +169,7 @@ static int mpegts_write_section1(MpegTSSection *s, int tid, int id, q = section; *q++ = tid; - put16(&q, 0xb000 | (len + 5 + 4)); /* 5 byte header + 4 byte CRC */ + put16(&q, flags | (len + 5 + 4)); /* 5 byte header + 4 byte CRC */ put16(&q, id); *q++ = 0xc1 | (version << 1); /* current_next_indicator = 1 */ *q++ = sec_num; @@ -148,16 +183,9 @@ static int mpegts_write_section1(MpegTSSection *s, int tid, int id, /*********************************************/ /* mpegts writer */ -#define DEFAULT_PMT_START_PID 0x1000 -#define DEFAULT_START_PID 0x0100 -#define DEFAULT_PROVIDER_NAME "FFmpeg" +#define DEFAULT_PROVIDER_NAME "Libav" #define DEFAULT_SERVICE_NAME "Service01" -/* default network id, transport stream and service identifiers */ -#define DEFAULT_ONID 0x0001 -#define DEFAULT_TSID 0x0001 -#define DEFAULT_SID 0x0001 - /* a PES packet header is generated every DEFAULT_PES_HEADER_FREQ packets */ #define DEFAULT_PES_HEADER_FREQ 16 #define DEFAULT_PES_PAYLOAD_SIZE ((DEFAULT_PES_HEADER_FREQ - 1) * 184 + 170) @@ -172,9 +200,11 @@ typedef struct MpegTSWriteStream { int pid; /* stream associated pid */ int cc; int payload_index; + int first_pts_check; ///< first pts check needed int64_t payload_pts; int64_t payload_dts; uint8_t payload[DEFAULT_PES_PAYLOAD_SIZE]; + ADTSContext *adts; } MpegTSWriteStream; static void mpegts_write_pat(AVFormatContext *s) @@ -215,6 +245,7 @@ static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) for(i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; MpegTSWriteStream *ts_st = st->priv_data; + AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL,0); switch(st->codec->codec_id) { case CODEC_ID_MPEG1VIDEO: case CODEC_ID_MPEG2VIDEO: @@ -236,6 +267,9 @@ static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) case CODEC_ID_AAC: stream_type = STREAM_TYPE_AUDIO_AAC; break; + case CODEC_ID_AAC_LATM: + stream_type = STREAM_TYPE_AUDIO_AAC_LATM; + break; case CODEC_ID_AC3: stream_type = STREAM_TYPE_AUDIO_AC3; break; @@ -250,33 +284,61 @@ static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) /* write optional descriptors here */ switch(st->codec->codec_type) { - case CODEC_TYPE_AUDIO: - if (strlen(st->language) == 3) { + case AVMEDIA_TYPE_AUDIO: + if (lang) { + char *p; + char *next = lang->value; + uint8_t *len_ptr; + *q++ = 0x0a; /* ISO 639 language descriptor */ - *q++ = 4; - *q++ = st->language[0]; - *q++ = st->language[1]; - *q++ = st->language[2]; - *q++ = 0; /* undefined type */ + len_ptr = q++; + *len_ptr = 0; + + for (p = lang->value; next && *len_ptr < 255 / 4 * 4; p = next + 1) { + next = strchr(p, ','); + if (strlen(p) != 3 && (!next || next != p + 3)) + continue; /* not a 3-letter code */ + + *q++ = *p++; + *q++ = *p++; + *q++ = *p++; + + if (st->disposition & AV_DISPOSITION_CLEAN_EFFECTS) + *q++ = 0x01; + else if (st->disposition & AV_DISPOSITION_HEARING_IMPAIRED) + *q++ = 0x02; + else if (st->disposition & AV_DISPOSITION_VISUAL_IMPAIRED) + *q++ = 0x03; + else + *q++ = 0; /* undefined type */ + + *len_ptr += 4; + } + + if (*len_ptr == 0) + q -= 2; /* no language codes were written */ } break; - case CODEC_TYPE_SUBTITLE: + case AVMEDIA_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]; *q++ = language[1]; *q++ = language[2]; *q++ = 0x10; /* normal subtitles (0x20 = if hearing pb) */ - put16(&q, 1); /* page id */ - put16(&q, 1); /* ancillary page id */ + if(st->codec->extradata_size == 4) { + memcpy(q, st->codec->extradata, 4); + q += 4; + } else { + put16(&q, 1); /* page id */ + put16(&q, 1); /* ancillary page id */ + } } break; - case CODEC_TYPE_VIDEO: + case AVMEDIA_TYPE_VIDEO: if (stream_type == STREAM_TYPE_VIDEO_DIRAC) { *q++ = 0x05; /*MPEG-2 registration descriptor*/ *q++ = 4; @@ -361,7 +423,7 @@ static MpegTSService *mpegts_add_service(MpegTSWrite *ts, service = av_mallocz(sizeof(MpegTSService)); if (!service) return NULL; - service->pmt.pid = DEFAULT_PMT_START_PID + ts->nb_services - 1; + service->pmt.pid = ts->pmt_start_pid + ts->nb_services; service->sid = sid; service->provider_name = av_strdup(provider_name); service->name = av_strdup(name); @@ -373,7 +435,7 @@ static MpegTSService *mpegts_add_service(MpegTSWrite *ts, static void section_write_packet(MpegTSSection *s, const uint8_t *packet) { AVFormatContext *ctx = s->opaque; - put_buffer(ctx->pb, packet, TS_PACKET_SIZE); + avio_write(ctx->pb, packet, TS_PACKET_SIZE); } static int mpegts_write_header(AVFormatContext *s) @@ -381,86 +443,154 @@ static int mpegts_write_header(AVFormatContext *s) MpegTSWrite *ts = s->priv_data; MpegTSWriteStream *ts_st; MpegTSService *service; - AVStream *st; - int i, total_bit_rate; + AVStream *st, *pcr_st = NULL; + AVDictionaryEntry *title, *provider; + int i, j; const char *service_name; + const char *provider_name; + int *pids; - ts->tsid = DEFAULT_TSID; - ts->onid = DEFAULT_ONID; + ts->tsid = ts->transport_stream_id; + ts->onid = ts->original_network_id; /* allocate a single DVB service */ - service_name = s->title; - if (service_name[0] == '\0') - service_name = DEFAULT_SERVICE_NAME; - service = mpegts_add_service(ts, DEFAULT_SID, - DEFAULT_PROVIDER_NAME, service_name); + title = av_dict_get(s->metadata, "service_name", NULL, 0); + if (!title) + title = av_dict_get(s->metadata, "title", NULL, 0); + service_name = title ? title->value : DEFAULT_SERVICE_NAME; + provider = av_dict_get(s->metadata, "service_provider", NULL, 0); + provider_name = provider ? provider->value : DEFAULT_PROVIDER_NAME; + service = mpegts_add_service(ts, ts->service_id, provider_name, service_name); service->pmt.write_packet = section_write_packet; service->pmt.opaque = s; + service->pmt.cc = 15; ts->pat.pid = PAT_PID; - ts->pat.cc = 0; + ts->pat.cc = 15; // Initialize at 15 so that it wraps and be equal to 0 for the first packet we write ts->pat.write_packet = section_write_packet; ts->pat.opaque = s; ts->sdt.pid = SDT_PID; - ts->sdt.cc = 0; + ts->sdt.cc = 15; ts->sdt.write_packet = section_write_packet; ts->sdt.opaque = s; + pids = av_malloc(s->nb_streams * sizeof(*pids)); + if (!pids) + return AVERROR(ENOMEM); + /* assign pids to each stream */ - total_bit_rate = 0; for(i = 0;i < s->nb_streams; i++) { st = s->streams[i]; + av_set_pts_info(st, 33, 1, 90000); ts_st = av_mallocz(sizeof(MpegTSWriteStream)); if (!ts_st) goto fail; st->priv_data = ts_st; ts_st->service = service; - ts_st->pid = DEFAULT_START_PID + i; + /* MPEG pid values < 16 are reserved. Applications which set st->id in + * this range are assigned a calculated pid. */ + if (st->id < 16) { + ts_st->pid = ts->start_pid + i; + } else if (st->id < 0x1FFF) { + ts_st->pid = st->id; + } else { + av_log(s, AV_LOG_ERROR, "Invalid stream id %d, must be less than 8191\n", st->id); + goto fail; + } + if (ts_st->pid == service->pmt.pid) { + av_log(s, AV_LOG_ERROR, "Duplicate stream id %d\n", ts_st->pid); + goto fail; + } + for (j = 0; j < i; j++) + if (pids[j] == ts_st->pid) { + av_log(s, AV_LOG_ERROR, "Duplicate stream id %d\n", ts_st->pid); + goto fail; + } + pids[i] = ts_st->pid; ts_st->payload_pts = AV_NOPTS_VALUE; ts_st->payload_dts = AV_NOPTS_VALUE; + ts_st->first_pts_check = 1; + ts_st->cc = 15; /* update PCR pid by using the first video stream */ - if (st->codec->codec_type == CODEC_TYPE_VIDEO && - service->pcr_pid == 0x1fff) + if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && + service->pcr_pid == 0x1fff) { service->pcr_pid = ts_st->pid; - total_bit_rate += st->codec->bit_rate; + pcr_st = st; + } + if (st->codec->codec_id == CODEC_ID_AAC && + st->codec->extradata_size > 0) { + ts_st->adts = av_mallocz(sizeof(*ts_st->adts)); + if (!ts_st->adts) + return AVERROR(ENOMEM); + if (ff_adts_decode_extradata(s, ts_st->adts, st->codec->extradata, + st->codec->extradata_size) < 0) + return -1; + } } + av_free(pids); + /* if no video stream, use the first stream as PCR */ if (service->pcr_pid == 0x1fff && s->nb_streams > 0) { - ts_st = s->streams[0]->priv_data; + pcr_st = s->streams[0]; + ts_st = pcr_st->priv_data; service->pcr_pid = ts_st->pid; } - if (total_bit_rate <= 8 * 1024) - total_bit_rate = 8 * 1024; - service->pcr_packet_freq = (total_bit_rate * PCR_RETRANS_TIME) / - (TS_PACKET_SIZE * 8 * 1000); - ts->sdt_packet_freq = (total_bit_rate * SDT_RETRANS_TIME) / - (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; - - /* write info at the start of the file, so that it will be fast to - find them */ - mpegts_write_sdt(s); - mpegts_write_pat(s); - for(i = 0; i < ts->nb_services; i++) { - mpegts_write_pmt(s, ts->services[i]); + ts->mux_rate = s->mux_rate ? s->mux_rate : 1; + + if (ts->mux_rate > 1) { + service->pcr_packet_period = (ts->mux_rate * PCR_RETRANS_TIME) / + (TS_PACKET_SIZE * 8 * 1000); + ts->sdt_packet_period = (ts->mux_rate * SDT_RETRANS_TIME) / + (TS_PACKET_SIZE * 8 * 1000); + ts->pat_packet_period = (ts->mux_rate * PAT_RETRANS_TIME) / + (TS_PACKET_SIZE * 8 * 1000); + + ts->first_pcr = av_rescale(s->max_delay, PCR_TIME_BASE, AV_TIME_BASE); + } else { + /* Arbitrary values, PAT/PMT could be written on key frames */ + ts->sdt_packet_period = 200; + ts->pat_packet_period = 40; + if (pcr_st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { + if (!pcr_st->codec->frame_size) { + av_log(s, AV_LOG_WARNING, "frame size not set\n"); + service->pcr_packet_period = + pcr_st->codec->sample_rate/(10*512); + } else { + service->pcr_packet_period = + pcr_st->codec->sample_rate/(10*pcr_st->codec->frame_size); + } + } else { + // max delta PCR 0.1s + service->pcr_packet_period = + pcr_st->codec->time_base.den/(10*pcr_st->codec->time_base.num); + } } - put_flush_packet(s->pb); + + // output a PCR as soon as possible + service->pcr_packet_count = service->pcr_packet_period; + ts->pat_packet_count = ts->pat_packet_period-1; + ts->sdt_packet_count = ts->sdt_packet_period-1; + + if (ts->mux_rate == 1) + av_log(s, AV_LOG_INFO, "muxrate VBR, "); + else + av_log(s, AV_LOG_INFO, "muxrate %d, ", ts->mux_rate); + av_log(s, AV_LOG_INFO, "pcr every %d pkts, " + "sdt every %d, pat/pmt every %d pkts\n", + service->pcr_packet_period, + ts->sdt_packet_period, ts->pat_packet_period); + + avio_flush(s->pb); return 0; fail: + av_free(pids); for(i = 0;i < s->nb_streams; i++) { st = s->streams[i]; - av_free(st->priv_data); + av_freep(&st->priv_data); } return -1; } @@ -471,11 +601,11 @@ static void retransmit_si_info(AVFormatContext *s) MpegTSWrite *ts = s->priv_data; int i; - if (++ts->sdt_packet_count == ts->sdt_packet_freq) { + if (++ts->sdt_packet_count == ts->sdt_packet_period) { ts->sdt_packet_count = 0; mpegts_write_sdt(s); } - if (++ts->pat_packet_count == ts->pat_packet_freq) { + if (++ts->pat_packet_count == ts->pat_packet_period) { ts->pat_packet_count = 0; mpegts_write_pat(s); for(i = 0; i < ts->nb_services; i++) { @@ -484,6 +614,66 @@ static void retransmit_si_info(AVFormatContext *s) } } +static int64_t get_pcr(const MpegTSWrite *ts, AVIOContext *pb) +{ + return av_rescale(avio_tell(pb) + 11, 8 * PCR_TIME_BASE, ts->mux_rate) + + ts->first_pcr; +} + +static uint8_t* write_pcr_bits(uint8_t *buf, int64_t pcr) +{ + int64_t pcr_low = pcr % 300, pcr_high = pcr / 300; + + *buf++ = pcr_high >> 25; + *buf++ = pcr_high >> 17; + *buf++ = pcr_high >> 9; + *buf++ = pcr_high >> 1; + *buf++ = pcr_high << 7 | pcr_low >> 8 | 0x7e; + *buf++ = pcr_low; + + return buf; +} + +/* Write a single null transport stream packet */ +static void mpegts_insert_null_packet(AVFormatContext *s) +{ + uint8_t *q; + uint8_t buf[TS_PACKET_SIZE]; + + q = buf; + *q++ = 0x47; + *q++ = 0x00 | 0x1f; + *q++ = 0xff; + *q++ = 0x10; + memset(q, 0x0FF, TS_PACKET_SIZE - (q - buf)); + avio_write(s->pb, buf, TS_PACKET_SIZE); +} + +/* Write a single transport stream packet with a PCR and no payload */ +static void mpegts_insert_pcr_only(AVFormatContext *s, AVStream *st) +{ + MpegTSWrite *ts = s->priv_data; + MpegTSWriteStream *ts_st = st->priv_data; + uint8_t *q; + uint8_t buf[TS_PACKET_SIZE]; + + q = buf; + *q++ = 0x47; + *q++ = ts_st->pid >> 8; + *q++ = ts_st->pid; + *q++ = 0x20 | ts_st->cc; /* Adaptation only */ + /* Continuity Count field does not increment (see 13818-1 section 2.4.3.3) */ + *q++ = TS_PACKET_SIZE - 5; /* Adaptation Field Length */ + *q++ = 0x10; /* Adaptation flags: PCR present */ + + /* PCR coded into 6 bytes */ + q = write_pcr_bits(q, get_pcr(ts, s->pb)); + + /* stuffing bytes */ + memset(q, 0xFF, TS_PACKET_SIZE - (q - buf)); + avio_write(s->pb, buf, TS_PACKET_SIZE); +} + static void write_pts(uint8_t *q, int fourbits, int64_t pts) { int val; @@ -498,7 +688,11 @@ static void write_pts(uint8_t *q, int fourbits, int64_t pts) *q++ = val; } -/* NOTE: pes_data contains all the PES packet */ +/* Add a pes header to the front of payload, and segment into an integer number of + * ts packets. The final ts packet is padded using an over-sized adaptation header + * to exactly fill the last ts packet. + * NOTE: 'payload' contains a complete PES payload. + */ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, const uint8_t *payload, int payload_size, int64_t pts, int64_t dts) @@ -510,6 +704,7 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, int val, is_start, len, header_len, write_pcr, private_code, flags; int afc_len, stuffing_len; int64_t pcr = -1; /* avoid warning */ + int64_t delay = av_rescale(s->max_delay, 90000, AV_TIME_BASE); is_start = 1; while (payload_size > 0) { @@ -517,14 +712,25 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, write_pcr = 0; if (ts_st->pid == ts_st->service->pcr_pid) { - ts_st->service->pcr_packet_count++; + if (ts->mux_rate > 1 || is_start) // VBR pcr period is based on frames + ts_st->service->pcr_packet_count++; if (ts_st->service->pcr_packet_count >= - ts_st->service->pcr_packet_freq) { + ts_st->service->pcr_packet_period) { ts_st->service->pcr_packet_count = 0; write_pcr = 1; } } + if (ts->mux_rate > 1 && dts != AV_NOPTS_VALUE && + (dts - get_pcr(ts, s->pb)/300) > delay) { + /* pcr insert gets priority over null packet insert */ + if (write_pcr) + mpegts_insert_pcr_only(s, st); + else + mpegts_insert_null_packet(s); + continue; /* recalculate write_pcr and possibly retransmit si_info */ + } + /* prepare packet header */ q = buf; *q++ = 0x47; @@ -533,19 +739,19 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, val |= 0x40; *q++ = val; *q++ = ts_st->pid; - *q++ = 0x10 | ts_st->cc | (write_pcr ? 0x20 : 0); ts_st->cc = (ts_st->cc + 1) & 0xf; + *q++ = 0x10 | ts_st->cc | (write_pcr ? 0x20 : 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 (ts->mux_rate > 1) + pcr = get_pcr(ts, s->pb); + else + pcr = (dts - delay)*300; + if (dts != AV_NOPTS_VALUE && dts < pcr / 300) + av_log(s, AV_LOG_WARNING, "dts < pcr, TS is invalid\n"); *q++ = 7; /* AFC length */ *q++ = 0x10; /* flags: PCR present */ - *q++ = pcr >> 25; - *q++ = pcr >> 17; - *q++ = pcr >> 9; - *q++ = pcr >> 1; - *q++ = (pcr & 1) << 7; - *q++ = 0; + q = write_pcr_bits(q, pcr); } if (is_start) { int pes_extension = 0; @@ -554,18 +760,19 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, *q++ = 0x00; *q++ = 0x01; private_code = 0; - if (st->codec->codec_type == CODEC_TYPE_VIDEO) { + if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { if (st->codec->codec_id == CODEC_ID_DIRAC) { *q++ = 0xfd; } else *q++ = 0xe0; - } else if (st->codec->codec_type == CODEC_TYPE_AUDIO && + } else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && (st->codec->codec_id == CODEC_ID_MP2 || - st->codec->codec_id == CODEC_ID_MP3)) { + st->codec->codec_id == CODEC_ID_MP3 || + st->codec->codec_id == CODEC_ID_AAC)) { *q++ = 0xc0; } else { *q++ = 0xbd; - if (st->codec->codec_type == CODEC_TYPE_SUBTITLE) { + if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) { private_code = 0x20; } } @@ -575,11 +782,11 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, header_len += 5; flags |= 0x80; } - if (dts != AV_NOPTS_VALUE) { + if (dts != AV_NOPTS_VALUE && pts != AV_NOPTS_VALUE && dts != pts) { header_len += 5; flags |= 0x40; } - if (st->codec->codec_type == CODEC_TYPE_VIDEO && + if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && st->codec->codec_id == CODEC_ID_DIRAC) { /* set PES_extension_flag */ pes_extension = 1; @@ -595,11 +802,13 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, len = payload_size + header_len + 3; if (private_code != 0) len++; + if (len > 0xffff) + len = 0; *q++ = len >> 8; *q++ = len; val = 0x80; /* data alignment indicator is required for subtitle data */ - if (st->codec->codec_type == CODEC_TYPE_SUBTITLE) + if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) val |= 0x04; *q++ = val; *q++ = flags; @@ -608,7 +817,7 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, write_pts(q, flags >> 6, pts); q += 5; } - if (dts != AV_NOPTS_VALUE) { + if (dts != AV_NOPTS_VALUE && pts != AV_NOPTS_VALUE && dts != pts) { write_pts(q, 1, dts); q += 5; } @@ -657,52 +866,110 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, memcpy(buf + TS_PACKET_SIZE - len, payload, len); payload += len; payload_size -= len; - put_buffer(s->pb, buf, TS_PACKET_SIZE); - ts->cur_pcr += TS_PACKET_SIZE*8*90000LL/ts->mux_rate; + avio_write(s->pb, buf, TS_PACKET_SIZE); } - put_flush_packet(s->pb); + avio_flush(s->pb); } static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt) { AVStream *st = s->streams[pkt->stream_index]; - int size= pkt->size; + 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 uint64_t delay = av_rescale(s->max_delay, 90000, AV_TIME_BASE)*2; + int64_t dts = AV_NOPTS_VALUE, pts = AV_NOPTS_VALUE; - 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); - return 0; + if (pkt->pts != AV_NOPTS_VALUE) + pts = pkt->pts + delay; + if (pkt->dts != AV_NOPTS_VALUE) + dts = pkt->dts + delay; + + if (ts_st->first_pts_check && pts == AV_NOPTS_VALUE) { + av_log(s, AV_LOG_ERROR, "first pts value must set\n"); + return -1; } + ts_st->first_pts_check = 0; + + if (st->codec->codec_id == CODEC_ID_H264) { + const uint8_t *p = buf, *buf_end = p+size; + uint32_t state = -1; + + if (pkt->size < 5 || AV_RB32(pkt->data) != 0x0000001) { + av_log(s, AV_LOG_ERROR, "h264 bitstream malformated, " + "no startcode found, use -vbsf h264_mp4toannexb\n"); + return -1; + } - 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); + do { + p = ff_find_start_code(p, buf_end, &state); + //av_log(s, AV_LOG_INFO, "nal %d\n", state & 0x1f); + } while (p < buf_end && (state & 0x1f) != 9 && + (state & 0x1f) != 5 && (state & 0x1f) != 1); + + if ((state & 0x1f) != 9) { // 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] = 0xf0; // any slice type (0xe) + rbsp stop one bit + buf = data; + size = pkt->size+6; + } + } else if (st->codec->codec_id == CODEC_ID_AAC) { + if (pkt->size < 2) + return -1; + if ((AV_RB16(pkt->data) & 0xfff0) != 0xfff0) { + ADTSContext *adts = ts_st->adts; + int new_size; + if (!adts) { + av_log(s, AV_LOG_ERROR, "aac bitstream not in adts format " + "and extradata missing\n"); + return -1; + } + new_size = ADTS_HEADER_SIZE+adts->pce_size+pkt->size; + if ((unsigned)new_size >= INT_MAX) + return -1; + data = av_malloc(new_size); + if (!data) + return AVERROR(ENOMEM); + ff_adts_write_frame_header(adts, data, pkt->size, adts->pce_size); + if (adts->pce_size) { + memcpy(data+ADTS_HEADER_SIZE, adts->pce_data, adts->pce_size); + adts->pce_size = 0; + } + memcpy(data+ADTS_HEADER_SIZE+adts->pce_size, pkt->data, pkt->size); + buf = data; + size = new_size; + } + } + + if (st->codec->codec_type != AVMEDIA_TYPE_AUDIO) { + // for video and subtitle, write a single pes packet + mpegts_write_pes(s, st, buf, size, pts, dts); + av_free(data); return 0; } - max_payload_size = DEFAULT_PES_PAYLOAD_SIZE; - while (size > 0) { - len = max_payload_size - ts_st->payload_index; - if (len > size) - len = size; - memcpy(ts_st->payload + ts_st->payload_index, buf, len); - 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 (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; - } + + if (ts_st->payload_index + size > DEFAULT_PES_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_index = 0; } + + if (!ts_st->payload_index) { + ts_st->payload_pts = pts; + ts_st->payload_dts = dts; + } + + memcpy(ts_st->payload + ts_st->payload_index, buf, size); + ts_st->payload_index += size; + + av_free(data); + return 0; } @@ -722,8 +989,9 @@ static int mpegts_write_end(AVFormatContext *s) mpegts_write_pes(s, st, ts_st->payload, ts_st->payload_index, ts_st->payload_pts, ts_st->payload_dts); } + av_freep(&ts_st->adts); } - put_flush_packet(s->pb); + avio_flush(s->pb); for(i = 0; i < ts->nb_services; i++) { service = ts->services[i]; @@ -736,7 +1004,7 @@ static int mpegts_write_end(AVFormatContext *s) return 0; } -AVOutputFormat mpegts_muxer = { +AVOutputFormat ff_mpegts_muxer = { "mpegts", NULL_IF_CONFIG_SMALL("MPEG-2 transport stream format"), "video/x-mpegts", @@ -747,4 +1015,5 @@ AVOutputFormat mpegts_muxer = { mpegts_write_header, mpegts_write_packet, mpegts_write_end, + .priv_class = &mpegts_muxer_class, };