From patchwork Tue Sep 19 19:10:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 43787 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a886:b0:149:dfde:5c0a with SMTP id ca6csp168515pzb; Tue, 19 Sep 2023 12:21:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGikgOBygrDlqpyMT87C7J2POToSTJ4wNE9RQeI26LTC2Uo7gotN43t+EVLiXyUk7FoZ+PQ X-Received: by 2002:a05:6512:2526:b0:503:294d:78b with SMTP id be38-20020a056512252600b00503294d078bmr515490lfb.46.1695151269331; Tue, 19 Sep 2023 12:21:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695151269; cv=none; d=google.com; s=arc-20160816; b=lfZYt+pWMIzWTCMcB9UxyZj3MbA51e23zoRc4AywJKz9Hn/zEdYfzx0/M9iWZZp8QQ 34U2tAJUA9/rZyMvrzJB1QtIA9UYkpnYVULbtE7eiJ20cINyRDJzR2SuLjrQjLpM5n9T 7L5NyQGo6GQayW8GgWjP3a4OECEWVIL35XjFAEw9nay/Sdg23l3fvBOhVhJaLJANuHyK 2rbnMRuLMhGQy4RnSPqs8E9ql2c9HLQhInMiuSwJLAkXc/K2QnSF0SLG0u5eJnkORpnI fyhv0RX7Mmv6C6K8Bn9hEky2FoBDIKKa/kO83L/txLcD1ceKNyoaTjDRQgOdrF/GocQW 7sYA== 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:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=A+QYwfytPwkMvRMbZQdfVizHXSVugqY7f7iPLZbf/po=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=nJatPxg/AgD16j68xK4NXYsGy3+nXvxhDS5N0YU3eYxjG76Ae3cmsHC6aMp+Va6OfQ SVnQqzze8G6tFTvl9jZT2dkliVeDcBF9ui43G9eeXzr9IZ/vgQptyT4+h7fmi8id+Gay sc1Ypy32nFvyHStcfex46cOGlMY2Fnj8Fs3HNglqdIr18no1theP2pJM5clVziyJ6c1f k0fWzMmTmidrP9+PuL+laO4OK/5z278OmsJRQvse8T2SmPhbDZ/nd/4qAx3rmeNy6HBK HttOlJ760eMJO0EQEdN1x/NRg188Xw02JZBsogsy+7QTocChDc53vOg2x3/3c3ljSaAY OuVg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cm28-20020a0564020c9c00b005304f4c993fsi9018227edb.305.2023.09.19.12.21.08; Tue, 19 Sep 2023 12:21:09 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3671468C90A; Tue, 19 Sep 2023 22:20:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A33EE68C856 for ; Tue, 19 Sep 2023 22:20:48 +0300 (EEST) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 721C0513C for ; Tue, 19 Sep 2023 21:20:47 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id EgRcxC9wMqsa for ; Tue, 19 Sep 2023 21:20:42 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 23BB410 for ; Tue, 19 Sep 2023 21:20:42 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 0BCAA3A0D2D for ; Tue, 19 Sep 2023 21:20:42 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Sep 2023 21:10:28 +0200 Message-Id: <20230919191044.18873-2-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230919191044.18873-1-anton@khirnov.net> References: <20230919191044.18873-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/27] fftools/ffmpeg: move derivation of frame duration from filter framerate 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: 0VDMRXm1QlWv From ffmpeg_enc to ffmpeg_filter, which is a more appropriate place for it. fate-lavf-gxf* no longer spuriously duplicate the first video frame, due to different rounding. --- fftools/ffmpeg_enc.c | 9 +-------- fftools/ffmpeg_filter.c | 6 +++++- tests/ref/lavf/gxf | 2 +- tests/ref/lavf/gxf_ntsc | 2 +- tests/ref/lavf/gxf_pal | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index b40a6211a9..9b8b3e0226 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -1109,16 +1109,9 @@ static int do_video_out(OutputFile *of, OutputStream *ost, AVFrame *frame) int64_t nb_frames, nb_frames_prev, i; double duration = 0; - if (frame) { - FrameData *fd = frame_data(frame); - + if (frame) duration = lrintf(frame->duration * av_q2d(frame->time_base) / av_q2d(enc->time_base)); - if (duration <= 0 && - fd->frame_rate_filter.num > 0 && fd->frame_rate_filter.den > 0) - duration = 1 / (av_q2d(fd->frame_rate_filter) * av_q2d(enc->time_base)); - } - video_sync_process(of, ost, frame, duration, &nb_frames, &nb_frames_prev); diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 9bf870b615..b6348d7f87 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -1817,8 +1817,12 @@ static int fg_output_step(OutputFilterPriv *ofp, int flush) if (ost->type == AVMEDIA_TYPE_VIDEO) { AVRational fr = av_buffersink_get_frame_rate(filter); - if (fr.num > 0 && fr.den > 0) + if (fr.num > 0 && fr.den > 0) { fd->frame_rate_filter = fr; + + if (!frame->duration) + frame->duration = av_rescale_q(1, av_inv_q(fr), frame->time_base); + } } ret = enc_frame(ost, frame); diff --git a/tests/ref/lavf/gxf b/tests/ref/lavf/gxf index e8351fab86..d5fd40c8ab 100644 --- a/tests/ref/lavf/gxf +++ b/tests/ref/lavf/gxf @@ -1,3 +1,3 @@ 0638c4d073ac224608baaba16732b68f *tests/data/lavf/lavf.gxf 795876 tests/data/lavf/lavf.gxf -tests/data/lavf/lavf.gxf CRC=0x5ade0285 +tests/data/lavf/lavf.gxf CRC=0xe032707a diff --git a/tests/ref/lavf/gxf_ntsc b/tests/ref/lavf/gxf_ntsc index 60efd80462..d375420ee6 100644 --- a/tests/ref/lavf/gxf_ntsc +++ b/tests/ref/lavf/gxf_ntsc @@ -1,3 +1,3 @@ 9a27673c85f1671ba9ff7cd33e5735de *tests/data/lavf/lavf.gxf_ntsc 794660 tests/data/lavf/lavf.gxf_ntsc -tests/data/lavf/lavf.gxf_ntsc CRC=0xdcd39443 +tests/data/lavf/lavf.gxf_ntsc CRC=0xaf956c57 diff --git a/tests/ref/lavf/gxf_pal b/tests/ref/lavf/gxf_pal index aefcd0ccab..83b0482431 100644 --- a/tests/ref/lavf/gxf_pal +++ b/tests/ref/lavf/gxf_pal @@ -1,3 +1,3 @@ 4d1bd16c6d52468c05711d8301e4e302 *tests/data/lavf/lavf.gxf_pal 795880 tests/data/lavf/lavf.gxf_pal -tests/data/lavf/lavf.gxf_pal CRC=0x1dbfef76 +tests/data/lavf/lavf.gxf_pal CRC=0x34fe5d7a