From patchwork Thu Sep 29 18:00:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 38460 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp841930pzh; Thu, 29 Sep 2022 03:00:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4uDxle0Qqc+rxWJfm+YLsHCt7XEnjWdYvZ09evyFBf5uW5m04sMbjYtNThVRDXGY8usKGA X-Received: by 2002:aa7:de91:0:b0:451:ecf8:e3b6 with SMTP id j17-20020aa7de91000000b00451ecf8e3b6mr2457448edv.402.1664445645519; Thu, 29 Sep 2022 03:00:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664445645; cv=none; d=google.com; s=arc-20160816; b=VKD616ePtz7Cf05lJuxlf6K27zXDx4dDqEfpQAf+YWvAu7SB3xheEKSa1JpPf5/PGh nWfWMt6MHh0GnYLtQP//V8vOcSAeg14ZB7lpdHEUh+AF15amLCN/fVsx+HVXgVqbsrD2 9NaMn9+Mj/mRe/WxZAd+t7yR1llsoYCx/ssFN7LZm5Gq+9Y84aGMKmgXsDuuNzjUJtV0 nglcW/yCmrqlMx5dZghjigByIHwdkSRZu1439S79msz15vE8aV3kF22bpQyKEXp8KFsf owuGq3d/lZ7rtgTg7dsgQtzaHiPIDrIJAEhJYbDtufP49/nMpBjqH97iZg+8d0UgRIrR BUHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=MZUY9w+OUbLlQ96DOSdZj9rEl7KoAuvpFrN45wv8zc4=; b=nOY1bTuz6rlEOeQnF8cm69tV0jGjeNrLLLQhd5kz7ih5792V+yYuZ3PfiAS/rbxG4y 7DVY3H/472wo/1lK5H4X8To0Bd9NmC5ElGIa+Amavl5flZ9//8CwWUAcd3gHFIV+GNB3 R+kTTs8w1B3YQt9mZeP7ksCaq4b8YWBldr5x1ara0mp+oGlbgE9o7wjGveWJ3p1fK9NA x1h2Tfnwh5gvbQeS7sr0s32L4c5VeNRgbR4u6JtfUAJQa0B6mSTwIsUGwD67AyAK8uUO qu5B/se5WnGgc3OspTC1iO/3MKYZtazzgkYyFWxOsSUlsOXICkO7OwSAipxpaQP1RBT+ OBJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=Jcrddt92; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jg5-20020a170907970500b007307fa2da78si8510168ejc.450.2022.09.29.03.00.44; Thu, 29 Sep 2022 03:00:45 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=Jcrddt92; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3323468BB5B; Thu, 29 Sep 2022 13:00:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-27.mail.qq.com (out203-205-251-27.mail.qq.com [203.205.251.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F899680446 for ; Thu, 29 Sep 2022 13:00:32 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1664445628; bh=vK5xaLK3c/w9+QeWio3rS8EJ9dY/khNgTjfUhlARueA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Jcrddt92BIE6QOQ/5NUMwqtgSJ7CUtzEUl2eyFnb1O1TLO6I10lQ7Cu/TvQndSWdO kGv85AH4Tb+F3EeNuhEbrxZMnCfg8z7EWMrt7smgarCN83wabeB+cu/51j4Z2w2LkL u9exbb0jfws+cDNrAsaIN/dzIoR3FeOq4hZ04rNs= Received: from localhost.localdomain ([59.37.125.102]) by newxmesmtplogicsvrsza9.qq.com (NewEsmtp) with SMTP id 1B3F67C; Thu, 29 Sep 2022 18:00:27 +0800 X-QQ-mid: xmsmtpt1664445627tp823cr0e Message-ID: X-QQ-XMAILINFO: Mg/0DM1Zd+nHrx2qOZwb4eOgWnRKhr0hAm5duNFVBlhdTLVZKhEE5iWu8bS8iF Xh2vw/kfu8xa5eomu3XzENxU0SKLSDPUck+klQ22rnQJOQ2pb8j1nmrIfqZSB387S4XNmo507LNA ouQ6qeClnyhCgH+T5EiMtdqHOeh3S3Gbf7/wOd+pwsDw0ukofa2+TtKLgVfTRfMj8hDWadGSgoj3 +zkOVyLInaT+prTjOJ4IlnhXAgEeDmjWtR524ZPTB41kY5kHpO34HdP6c82mLoEl9yL3XU5g8Mth vmXP6FfEsECqD/nWMopCubtgmwjj5hUvH04+eT9YR0rm7LGNKfe/qtfbk6dje93FMKneOS09tWbo 6ms8VPLi0eDnYCFtJW5TKlYT10gS0xRz3VYCmOAtQRX7yPLfUbrxeJ/u/c7PZjUAT4UbsSiQ5B1o A1w2pj50syO/w2ptyaHrQV0pdJMiLikDQUI5InXbUFM4ojpkz+1kKD8AaJhfD8iEIQnYqCcO/LLt v94fTti56/MSbZvuODxxfcA0oobkgCfZEBaJs3a52nrq7FNx4yWUGxfAyyU8iH1RaVPVd3OviBln CLXQ2deK7DddS6GJomqN6v0DCTOD3iv1Y2ZI5UMBDYXIKRroGQJ/mmedljNj5q2oqVkGZznLcOea 86Xm8Vu5JpHiN7kQqfPTGNghT1Km6Np1ymgPeQxwlumJonux2BLuACI6UiEMd8mORZCyPfsXUUdi 3SIVa4+72MiIN2Q9aILuST9gMihkLdzD1cU6q/TfPzIn/aTwnQao/hLeY9keMby8HZEYPtXeM5Fp +fvO00XplU159S9ju8Rl8IcPQr0TSpzIeK3ga1D7BJjarSJ9jpiTfUcifXAw26ypt1WT98Ff//BZ 68m5M1ScuYhZakBhOtyRhNzGfwPtnZFUmxS9xAvjDObIYcVSYHl1Rem6ToBjJFwCRmkZFhaLlevC 5S8SXKt9HbmZia86BLwQ== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Sep 2022 02:00:31 +0800 X-OQ-MSGID: <20220929180031.1499413-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <85f9faa1-8ae4-5292-3973-3f679de91dd1@passwd.hu> References: <85f9faa1-8ae4-5292-3973-3f679de91dd1@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avformat/mpegtsenc: add omit_rai flag X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 6RvOQnk4tyx5 From: Zhao Zhili Add PCR at keyframe can be undesirable when -pcr_period is specified. Add an flag to disable this behavior. Signed-off-by: Zhao Zhili --- v2: change pcr_at_keyframe to omit_rai 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",