diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2014-06-06 15:59:25 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2014-06-10 22:05:44 +0200 |
| commit | f121dbd9f76031d7f6d56261be2f14937a19d2dd (patch) | |
| tree | 9a165c3d0070e70ba8e349bc93a0fab279a69ea4 | |
| parent | 3f7e94eccd1c0d64679f2c4eda8bb942a158dfac (diff) | |
| download | ffmpeg-f121dbd9f76031d7f6d56261be2f14937a19d2dd.tar.gz | |
mpegts: Provide an option to override the pcr period
Certain hardware demuxer have specific restrictions for PCR periodicity.
| -rw-r--r-- | doc/muxers.texi | 3 | ||||
| -rw-r--r-- | libavformat/mpegtsenc.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index 12d56efcd0..325bb9dbdb 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -405,6 +405,9 @@ Set the first PID for PMT (default 0x1000, max 0x1f00). Set the first PID for data packets (default 0x0100, max 0x0f00). @item -muxrate @var{number} Set a constant muxrate (default VBR). +@item -pcr_period @var{numer} +Override the default PCR retransmission time (default 20ms), ignored +if variable muxrate is selected. @end table The recognized metadata settings in mpegts muxer are @code{service_provider} diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 58a09fc60e..04cabe5f8d 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -79,6 +79,7 @@ typedef struct MpegTSWrite { int reemit_pat_pmt; // backward compatibility + int pcr_period; #define MPEGTS_FLAG_REEMIT_PAT_PMT 0x01 #define MPEGTS_FLAG_AAC_LATM 0x02 int flags; @@ -559,7 +560,7 @@ static int mpegts_write_header(AVFormatContext *s) } if (ts->mux_rate > 1) { - service->pcr_packet_period = (ts->mux_rate * PCR_RETRANS_TIME) / + service->pcr_packet_period = (ts->mux_rate * ts->pcr_period) / (TS_PACKET_SIZE * 8 * 1000); ts->sdt_packet_period = (ts->mux_rate * SDT_RETRANS_TIME) / (TS_PACKET_SIZE * 8 * 1000); @@ -1154,6 +1155,8 @@ static const AVOption options[] = { // backward compatibility { "resend_headers", "Reemit PAT/PMT before writing the next packet", offsetof(MpegTSWrite, reemit_pat_pmt), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM}, + { "pcr_period", "PCR retransmission time", + offsetof(MpegTSWrite, pcr_period), AV_OPT_TYPE_INT, { .i64 = PCR_RETRANS_TIME }, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM }, { NULL }, }; |