X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fmpegtsenc.c;h=bfd21db139eeebfeccbff204d3792b982e53ebc7;hb=7d87d56ff810b921537138f91048a932065260a1;hp=adb94af956dc069cb9441dd1d79e3ced6dace89a;hpb=72415b2adb2c25f95ceede49001bb97ed9247dbb;p=ffmpeg diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index adb94af956d..bfd21db139e 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -23,9 +23,12 @@ #include "libavutil/crc.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 */ /*********************************************/ @@ -59,7 +62,7 @@ typedef struct MpegTSWrite { int nb_services; int onid; int tsid; - uint64_t cur_pcr; + int64_t first_pcr; int mux_rate; ///< set to 1 when VBR } MpegTSWrite; @@ -73,7 +76,7 @@ static void mpegts_write_section(MpegTSSection *s, uint8_t *buf, int len) 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; @@ -108,8 +111,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; } } @@ -275,8 +276,13 @@ static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) *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 AVMEDIA_TYPE_VIDEO: @@ -386,8 +392,9 @@ static int mpegts_write_header(AVFormatContext *s) MpegTSService *service; AVStream *st, *pcr_st = NULL; AVMetadataTag *title; - int i; + int i, j; const char *service_name; + int *pids; ts->tsid = DEFAULT_TSID; ts->onid = DEFAULT_ONID; @@ -410,6 +417,10 @@ static int mpegts_write_header(AVFormatContext *s) 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 */ for(i = 0;i < s->nb_streams; i++) { st = s->streams[i]; @@ -418,7 +429,26 @@ static int mpegts_write_header(AVFormatContext *s) 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 = DEFAULT_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; @@ -433,13 +463,15 @@ static int mpegts_write_header(AVFormatContext *s) st->codec->extradata_size > 0) { ts_st->adts = av_mallocz(sizeof(*ts_st->adts)); if (!ts_st->adts) - return AVERROR_NOMEM; + 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) { pcr_st = s->streams[0]; @@ -457,7 +489,7 @@ static int mpegts_write_header(AVFormatContext *s) ts->pat_packet_period = (ts->mux_rate * PAT_RETRANS_TIME) / (TS_PACKET_SIZE * 8 * 1000); - ts->cur_pcr = av_rescale(s->max_delay, 90000, AV_TIME_BASE); + 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; @@ -483,18 +515,21 @@ static int mpegts_write_header(AVFormatContext *s) ts->pat_packet_count = ts->pat_packet_period-1; ts->sdt_packet_count = ts->sdt_packet_period-1; - av_log(s, AV_LOG_INFO, - "muxrate %d bps, pcr every %d pkts, " + 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", - ts->mux_rate, service->pcr_packet_period, + service->pcr_packet_period, ts->sdt_packet_period, ts->pat_packet_period); - put_flush_packet(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); @@ -521,6 +556,26 @@ static void retransmit_si_info(AVFormatContext *s) } } +static int64_t get_pcr(const MpegTSWrite *ts, ByteIOContext *pb) +{ + return av_rescale(url_ftell(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 & 1) << 7) | (pcr_low >> 8); + *buf++ = pcr_low; + + return buf; +} + /* Write a single null transport stream packet */ static void mpegts_insert_null_packet(AVFormatContext *s) { @@ -535,7 +590,6 @@ static void mpegts_insert_null_packet(AVFormatContext *s) *q++ = 0x10; memset(q, 0x0FF, TS_PACKET_SIZE - (q - buf)); put_buffer(s->pb, buf, TS_PACKET_SIZE); - ts->cur_pcr += TS_PACKET_SIZE*8*90000LL/ts->mux_rate; } /* Write a single transport stream packet with a PCR and no payload */ @@ -544,7 +598,6 @@ static void mpegts_insert_pcr_only(AVFormatContext *s, AVStream *st) MpegTSWrite *ts = s->priv_data; MpegTSWriteStream *ts_st = st->priv_data; uint8_t *q; - uint64_t pcr = ts->cur_pcr; uint8_t buf[TS_PACKET_SIZE]; q = buf; @@ -557,17 +610,11 @@ static void mpegts_insert_pcr_only(AVFormatContext *s, AVStream *st) *q++ = 0x10; /* Adaptation flags: PCR present */ /* PCR coded into 6 bytes */ - *q++ = pcr >> 25; - *q++ = pcr >> 17; - *q++ = pcr >> 9; - *q++ = pcr >> 1; - *q++ = (pcr & 1) << 7; - *q++ = 0; + q = write_pcr_bits(q, get_pcr(ts, s->pb)); /* stuffing bytes */ memset(q, 0xFF, TS_PACKET_SIZE - (q - buf)); put_buffer(s->pb, buf, TS_PACKET_SIZE); - ts->cur_pcr += TS_PACKET_SIZE*8*90000LL/ts->mux_rate; } static void write_pts(uint8_t *q, int fourbits, int64_t pts) @@ -618,7 +665,7 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, } if (ts->mux_rate > 1 && dts != AV_NOPTS_VALUE && - (dts - (int64_t)ts->cur_pcr) > delay) { + (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); @@ -640,19 +687,14 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, if (write_pcr) { // add 11, pcr references the last byte of program clock reference base if (ts->mux_rate > 1) - pcr = ts->cur_pcr + (4+7)*8*90000LL / ts->mux_rate; + pcr = get_pcr(ts, s->pb); else - pcr = dts - delay; - if (dts != AV_NOPTS_VALUE && dts < pcr) + 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; @@ -767,7 +809,6 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, payload += len; payload_size -= len; put_buffer(s->pb, buf, TS_PACKET_SIZE); - ts->cur_pcr += TS_PACKET_SIZE*8*90000LL/ts->mux_rate; } put_flush_packet(s->pb); } @@ -816,7 +857,7 @@ static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt) memcpy(data+6, pkt->data, pkt->size); AV_WB32(data, 0x00000001); data[4] = 0x09; - data[5] = 0xe0; // any slice type + data[5] = 0xf0; // any slice type (0xe) + rbsp stop one bit buf = data; size = pkt->size+6; } @@ -836,7 +877,7 @@ static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt) return -1; data = av_malloc(new_size); if (!data) - return AVERROR_NOMEM; + 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);