[SCM] libav/experimental: mpegts: Provide an option to override the pcr period

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit f121dbd9f76031d7f6d56261be2f14937a19d2dd
Author: Luca Barbato <lu_zero at gentoo.org>
Date:   Fri Jun 6 15:59:25 2014 +0200

    mpegts: Provide an option to override the pcr period
    
    Certain hardware demuxer have specific restrictions for PCR periodicity.

diff --git a/doc/muxers.texi b/doc/muxers.texi
index 12d56ef..325bb9d 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).
+ at 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 58a09fc..04cabe5 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 },
 };
 

-- 
Libav/FFmpeg packaging