Re: [FFmpeg-devel] [PATCH v2] avformat/mpegtsenc: add omit_rai flag

From: Marton Balint <cus@passwd.hu>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH v2] avformat/mpegtsenc: add omit_rai flag
Date: Sun, 2 Oct 2022 21:16:08 +0200 (CEST)
Message-ID: <7af99755-7ba6-c485-ac2c-d5265624dfc4@passwd.hu> (raw)
In-Reply-To: <tencent_C5ABB54E7870192D109A6C40009A639F2708@qq.com>

On Fri, 30 Sep 2022, Zhao Zhili wrote:

> From: Zhao Zhili <zhilizhao@tencent.com>
>
> Add PCR at keyframe can be undesirable when -pcr_period is
> specified. Add an flag to disable this behavior.
>
> Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
> ---
> v2: change pcr_at_keyframe to omit_rai

LGTM with libavformat micro version bump, thanks.

Marton

>
> doc/muxers.texi         | 2 ++
> libavformat/mpegtsenc.c | 6 +++++-
> 2 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/doc/muxers.texi b/doc/muxers.texi
> index b2f4326aae..4edbb22b00 100644
> --- a/doc/muxers.texi
> +++ b/doc/muxers.texi
> @@ -1915,6 +1915,8 @@ Conform to System B (DVB) instead of System A (ATSC).
> Mark the initial packet of each stream as discontinuity.
> @item nit
> Emit NIT table.
> +@item omit_rai
> +Disable writing of random access indicator.
> @end table
>
> @item mpegts_copyts @var{boolean}
> diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
> index 5148a6aecd..48d39e6a7d 100644
> --- a/libavformat/mpegtsenc.c
> +++ b/libavformat/mpegtsenc.c
> @@ -112,6 +112,7 @@ typedef struct MpegTSWrite {
> #define MPEGTS_FLAG_SYSTEM_B        0x08
> #define MPEGTS_FLAG_DISCONT         0x10
> #define MPEGTS_FLAG_NIT             0x20
> +#define MPEGTS_FLAG_OMIT_RAI        0x40
>     int flags;
>     int copyts;
>     int tables_version;
> @@ -1566,7 +1567,8 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
>             q = get_ts_payload_start(buf);
>             ts_st->discontinuity = 0;
>         }
> -        if (key && is_start && pts != AV_NOPTS_VALUE &&
> +        if (!(ts->flags & MPEGTS_FLAG_OMIT_RAI) &&
> +            key && is_start && pts != AV_NOPTS_VALUE &&
>             !is_dvb_teletext /* adaptation+payload forbidden for teletext (ETSI EN 300 472 V1.3.1 4.1) */) {
>             // set Random Access for key frames
>             if (ts_st->pcr_period)
> @@ -2282,6 +2284,8 @@ static const AVOption options[] = {
>       0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_FLAG_DISCONT }, 0, INT_MAX, ENC, "mpegts_flags" },
>     { "nit", "Enable NIT transmission",
>       0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_FLAG_NIT}, 0, INT_MAX, ENC, "mpegts_flags" },
> +    { "omit_rai", "Disable writing of random access indicator",
> +      0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_FLAG_OMIT_RAI }, 0, INT_MAX, ENC, "mpegts_flags" },
>     { "mpegts_copyts", "don't offset dts/pts", OFFSET(copyts), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, ENC },
>     { "tables_version", "set PAT, PMT, SDT and NIT version", OFFSET(tables_version), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 31, ENC },
>     { "omit_video_pes_length", "Omit the PES packet length for video packets",
> -- 
> 2.25.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".