From patchwork Thu Sep 8 09:51:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaolei Yu X-Patchwork-Id: 37760 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp173982pzh; Thu, 8 Sep 2022 02:51:26 -0700 (PDT) X-Google-Smtp-Source: AA6agR6/GtR9x0erHztmM95PwgW7xayyOn/UxrUCwiaeJCJRPAduC3elaniUmnl5JP9WeTCZ5a9u X-Received: by 2002:a05:6402:547:b0:44e:8d81:cd9c with SMTP id i7-20020a056402054700b0044e8d81cd9cmr6344061edx.196.1662630686701; Thu, 08 Sep 2022 02:51:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662630686; cv=none; d=google.com; s=arc-20160816; b=CGOwjrsR2RdJUehCrBGWf8CipQahadjhO5mc8kChuh0Zq+aAVuBbslax6Aef7VN3Uc IqP2CNbgyDjUehnnO9EvC/bHm0MzEJKuubLwmT1MCKF3mVbbbmZ2yylQHDi06vyIJuSg ZbD+Fh63xYemiFWa4XUe5eqI5uR9IJC42v7TWGGiPJF3uRAlczH0HLzeIMddqhhuOwqd Oa3UmfOp9DSaHX4JE6rcEkHs6+TKPqQM7X71t2z95Q5Hn8GRkoIBijjPrhfHHIF372LQ yGumjTGP+t4SW44aKn1v/AF8fEOt2GZazsvEA9ajqL6OhhQ5vgmjHgW9lf3O/eWB0c+V J8Kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-language:to:from:user-agent:mime-version :date:message-id:dkim-signature:delivered-to; bh=QuUfD4lPcTK9p9fDEf94XxFs46XyvNIwTnE39Jj1wCs=; b=zcoQsyKN3lt9arEhcQz82l3UjMKTT8goQNKxCBSjYHtATnk3FYSQreIFqqNt01C9eS JEJmOXs7LuhumPF3IwsxLNmHn3kOZ+CKUPu6mm5rvmtdTpwHT6BVWKSnLQbaoeZY1bM4 TkpfAjcxZ3KGMAbG7rv9MAQtFV/EjpSSdzLP6K4c+m21d5eJcAT/C5W4foZzcPABTkG2 5GM6ctKyvP1ubwd5HlX+eVPP5wjkSRVJI4HezPR4MrKnBV+InXgdrw4Qig1vyum20/eF G93plzeAVD4+WoFl1Tdt1Xv1BVHDit4XPRJypR25+qdjTS8xGDg8nl8/fR4HtQHgQB7v GjYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Wo0hVF73; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q19-20020a170906941300b00771d781fb94si1500165ejx.391.2022.09.08.02.51.25; Thu, 08 Sep 2022 02:51:26 -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=@gmail.com header.s=20210112 header.b=Wo0hVF73; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E4DF668BA30; Thu, 8 Sep 2022 12:51:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 06D6068B3B2 for ; Thu, 8 Sep 2022 12:51:16 +0300 (EEST) Received: by mail-pj1-f53.google.com with SMTP id z9-20020a17090a468900b001ffff693b27so1833595pjf.2 for ; Thu, 08 Sep 2022 02:51:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:from:to:cc:subject:date; bh=OmIp05PPcmC7ZWFz4G1brObt7UNMdpiJAxAO7t5SIwI=; b=Wo0hVF733MjON0Ik3lkFcHQA8MWDxgoTcQkjTNOdhLLJm/KMt7DryYFKVeTbC0S6MV YGjOj3s1rqKuEQm3ZqMVQNOYlzrbWRHIwKauYFRFW0sLxHB7zuo8sYu24KzjPkU7rMq6 x/SqZXJMlpiq6nXJM+QhaUTIA8dk0IpmHb/3B++ItcRZvOePzEQLynji0yu+8WL0+cCS w06oRE5yzN7RwDvfImfeo1oShDf1NE8EdxRXhV+6fpGxHuAEvT/dvijwu3oMdQwkwFXy mB3feuW2zje7OsybRMJdZbbi1+0AHbM79s0gGJleE0UuNqLW5vbo6/uSMhRX630tW61N 4qpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date; bh=OmIp05PPcmC7ZWFz4G1brObt7UNMdpiJAxAO7t5SIwI=; b=w4yIud3aVtzICJ2ENkApJCcWTj0us0rf5BfyNQPOMI3gELDQGbSaUDsCTw4TJOnUbG XkGEjG/bJzTAOyKhdb500ny3UFaVFV0+BUkmAy8ni+592dwircvjBCrmMs5nzH9BJyAd k0PdimSbB621c7S7+4XcbeptD00mRBYxzJqFAbLUedOyqtzW2vl8Zmuht+ZROn8CSmk3 nAY8+R3kG5omdh7BApmPoQEEV1suOqEdqQzlq5TOl1JTeNTDhk61kVSl4KFLYzxuTek7 2CiXCD8rOKRHtSvtl60Kr9Eq4DFchx48XB68sf+UNYbrDCI7Ic5CYDQUtoIVs1f+3hHp 4PzA== X-Gm-Message-State: ACgBeo2pcKmKuvz4ITihsSFLW18tIhkBsvo19VuGU1Q7wf5M5qfdL++M HwSABbgA1mmpfFAR6KvihfRJI6UbDjiNnw== X-Received: by 2002:a17:90b:4f45:b0:1f5:6554:d555 with SMTP id pj5-20020a17090b4f4500b001f56554d555mr3376579pjb.226.1662630673342; Thu, 08 Sep 2022 02:51:13 -0700 (PDT) Received: from [192.168.242.99] ([47.246.98.230]) by smtp.gmail.com with ESMTPSA id v6-20020a1709029a0600b00176a47e5840sm9542411plp.298.2022.09.08.02.51.12 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 08 Sep 2022 02:51:12 -0700 (PDT) Message-ID: Date: Thu, 8 Sep 2022 17:51:10 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 From: Xiaolei Yu To: ffmpeg-devel@ffmpeg.org Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] ffmpeg: fix increment of sync_opts 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +br5+PzFhhz+ The encoder time base could been overridden by the command line argument and may not always be 1/ost->frame_rate. --- fftools/ffmpeg.c | 2 +- tests/fate/ffmpeg.mak | 5 +++++ tests/ref/fate/enc_time_base-vfr | 25 +++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 tests/ref/fate/enc_time_base-vfr diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 0e1477299d..8bc48125c8 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1344,7 +1344,7 @@ static void do_video_out(OutputFile *of, if (ret < 0 && ret != AVERROR_EOF) exit_program(1); - ost->sync_opts++; + ost->sync_opts += av_rescale_q(1, av_inv_q(ost->frame_rate), ost->enc_ctx->time_base); ost->vsync_frame_number++; } diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index 38a1ae7ed5..a3be79d65e 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -209,3 +209,8 @@ FATE_TIME_BASE-$(call PARSERDEMDEC, MPEGVIDEO, MPEGPS, MPEG2VIDEO, MPEGVIDEO_DEM fate-time_base: CMD = md5 -i $(TARGET_SAMPLES)/mpeg2/dvd_single_frame.vob -an -sn -c:v copy -r 25 -time_base 1001:30000 -fflags +bitexact -f mxf FATE_SAMPLES_FFMPEG-yes += $(FATE_TIME_BASE-yes) + +FATE_ENC_TIME_BASE-$(call ALLYES, LAVFI_INDEV COLOR_FILTER FRAMEMD5_MUXER) += fate-enc_time_base-vfr +fate-enc_time_base-vfr: CMD = framemd5 -auto_conversion_filters -fflags +bitexact -flags +bitexact -f lavfi -i "color=r=30:d=1" -enc_time_base 1/600 -fps_mode vfr -r 15 + +FATE_SAMPLES_FFMPEG-yes += $(FATE_ENC_TIME_BASE-yes) diff --git a/tests/ref/fate/enc_time_base-vfr b/tests/ref/fate/enc_time_base-vfr new file mode 100644 index 0000000000..cb38177d8e --- /dev/null +++ b/tests/ref/fate/enc_time_base-vfr @@ -0,0 +1,25 @@ +#format: frame checksums +#version: 2 +#hash: MD5 +#tb 0: 1/600 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 320x240 +#sar 0: 1/1 +#stream#, dts, pts, duration, size, hash +0, 0, 0, 40, 115200, 8e4dd5c5c31a54672e30503f6ee13321 +0, 40, 40, 40, 115200, 8e4dd5c5c31a54672e30503f6ee13321 +0, 80, 80, 40, 115200, 8e4dd5c5c31a54672e30503f6ee13321 +0, 120, 120, 40, 115200, 8e4dd5c5c31a54672e30503f6ee13321 +0, 160, 160, 40, 115200, 8e4dd5c5c31a54672e30503f6ee13321 +0, 200, 200, 40, 115200, 8e4dd5c5c31a54672e30503f6ee13321 +0, 240, 240, 40, 115200, 8e4dd5c5c31a54672e30503f6ee13321 +0, 280, 280, 40, 115200, 8e4dd5c5c31a54672e30503f6ee13321 +0, 320, 320, 40, 115200, 8e4dd5c5c31a54672e30503f6ee13321 +0, 360, 360, 40, 115200, 8e4dd5c5c31a54672e30503f6ee13321 +0, 400, 400, 40, 115200, 8e4dd5c5c31a54672e30503f6ee13321 +0, 440, 440, 40, 115200, 8e4dd5c5c31a54672e30503f6ee13321 +0, 480, 480, 40, 115200, 8e4dd5c5c31a54672e30503f6ee13321 +0, 520, 520, 40, 115200, 8e4dd5c5c31a54672e30503f6ee13321 +0, 560, 560, 40, 115200, 8e4dd5c5c31a54672e30503f6ee13321 +0, 600, 600, 40, 115200, 8e4dd5c5c31a54672e30503f6ee13321