From patchwork Fri Apr 5 16:11:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 47844 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp1070406pzd; Fri, 5 Apr 2024 09:15:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU/4+evNWuVoTJeYdGOsAD7SyedpQtQv4U0fm4pYH2Ti29VCeTCQfwf6+SiycN7VqQlpaIFWDFY/jlGwaLg0HGr/Du8q27X4NeNaQ== X-Google-Smtp-Source: AGHT+IGxEKekg9yaxNs2frVXhZjvbBU0rIrwAUWmam+GMLs0cI3M/sD9LyATZQ6SjuBNN49y44xF X-Received: by 2002:a17:906:6a1a:b0:a4e:7d39:dff1 with SMTP id qw26-20020a1709066a1a00b00a4e7d39dff1mr2014850ejc.8.1712333735185; Fri, 05 Apr 2024 09:15:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712333735; cv=none; d=google.com; s=arc-20160816; b=c2ZRYoym3x1VxgdAdVvJOiS2tJEvih7ZHNFhA/UNEPLQZC5yxNwSPFYY436PWwZsJR pQ4XgYXjRY35rl18R+jhJ+uw4MroG3Rw36UmYTLFX/hOUbYePsgFDKDeDFkPPaDBvp6l XA2bLEcq/FIzX0SP08vJ+DEZrMWhoxU4DzlX+8P8NLKGIDnu28v+9M6Hte8n7bcp1jrc xJiQtA4NTpCDm1t9bJzg48dICj4GgwgAwqseHnQK77VMxWMDQXemkEiNEW4VtFOKRKwC 2ObaYjh9LJbFR1zqfQkiif2KBsN+3jUVPCsP6IncjVGSJoym3UnN45c6NLthwnzzcXdt upzA== 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:dkim-signature:delivered-to; bh=iV4BI2oe1+Jjsa1HXZVcRfwKCNsUA481iQGpjld8Plw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=kyox7YfRkyzai9uBjLoS3y8DkH2v3sM+/cMYvWN2cKcgJd7X9a0kLVVCvp2m7EbUh5 kOm7SMnKsvJxYPITJ4Jo5tj4L1MpiNUdn0Bs9DmLgamIdyCfCn98yFp0CiW3oZT/LkvL M76p9yEXnkYtfgRaInYr07YyYos+33d2M0uiU9Vr3DL8mwIUAORDbCf5MmLBbJiCa9zz ta8rZ3gQhhM9pcP/4IuHQOcUwLWTUCNRNFFfWqBEWaViKDYjRfQTvL8Q/NuX5z20T9zz pPgxHZP5aPvflUnTLprBrf6SYWe0oCrNkdVCdZCmZbhpSjZv1llJMBS36l7G9FW92iGY nSJA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=sGVZpLki; 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 oz41-20020a1709077da900b00a51a909a7d7si611112ejc.405.2024.04.05.09.15.34; Fri, 05 Apr 2024 09:15:35 -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=@khirnov.net header.s=mail header.b=sGVZpLki; 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 B6BDA68D276; Fri, 5 Apr 2024 19:13:25 +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 5699E68D188 for ; Fri, 5 Apr 2024 19:13:10 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=sGVZpLki; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id BB7F04D8A for ; Fri, 5 Apr 2024 18:13:06 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id YXfc14gQRN0C for ; Fri, 5 Apr 2024 18:13:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1712333582; bh=S9WvVJmwvhe3BimRAgw/faOL9qSrogA5WHFNof012oA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=sGVZpLkiCsGE06qjgBtxUcLmhVcj2sRJ71MlP4JnSeMeQu87pfNJkfZ76mNF658gN 9tY3FG26Xwz85tnr0VSNviYP32aNQIF4HbEGcj9SOjyOa7E7AfmlHGAVx0eeVk6JV+ JsnUJXDElbBlayW5233yR/9EgcqXrMB9CPhlUorvjr72r4dj6oTVqUxFIYr6Pf1ufm /WSnI6OCBqBku1ajmdvbphQYtcJp3jcBnDiYtzovRvwWulHzsoGJhC42+wX8HQLPFu Zuarr1wv/NHchOUhXJBZVLI9TP0fss56Z9okASV4woC6m90Q8RtYqOVqh7WNnNAs9G Fz9KMEV5PRfPg== 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 C95354D8E for ; Fri, 5 Apr 2024 18:13:02 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 0B5163A11E7 for ; Fri, 5 Apr 2024 18:12:56 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 18:11:54 +0200 Message-ID: <20240405161212.26167-13-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240405161212.26167-1-anton@khirnov.net> References: <20240405161212.26167-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/31] fftools/ffmpeg: drop OutputStream.is_cfr 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: +sIQ90zsmkON It is used in a single place in the filtering code, so it is better to inline it there. --- fftools/ffmpeg.h | 1 - fftools/ffmpeg_filter.c | 2 +- fftools/ffmpeg_mux_init.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index fa8f7d8324..16497105e1 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -551,7 +551,6 @@ typedef struct OutputStream { /* video only */ AVRational frame_rate; AVRational max_frame_rate; - int is_cfr; int force_fps; #if FFMPEG_OPT_TOP int top_field_first; diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index d906b72576..022c42e9c7 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -1956,7 +1956,7 @@ static int choose_out_timebase(OutputFilterPriv *ofp, AVFrame *frame) fr = fr_sink; } - if (ofilter->ost->is_cfr) { + if (fps->vsync_method == VSYNC_CFR || fps->vsync_method == VSYNC_VSCFR) { if (!fr.num && !fps->framerate_max.num) { fr = (AVRational){25, 1}; av_log(ofilter->ost, AV_LOG_WARNING, diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 6ffa4b7491..1791905d7e 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -816,7 +816,6 @@ static int new_stream_video(Muxer *mux, const OptionsContext *o, *vsync_method = VSYNC_VSCFR; } } - ost->is_cfr = (*vsync_method == VSYNC_CFR || *vsync_method == VSYNC_VSCFR); #if FFMPEG_OPT_VSYNC_DROP if (*vsync_method == VSYNC_DROP) ms->ts_drop = 1;