From patchwork Sat Aug 26 15:11:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 43342 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a17:906:4f0f:b0:99c:ff93:59c5 with SMTP id t15csp996410eju; Sat, 26 Aug 2023 08:14:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEth+FXRvUlO4wozZma832BO7bUrgX9jf4/jAyOdXZPZ+NK9rFdOlnTtzlyU9Ttww7TXUFi X-Received: by 2002:a50:fb83:0:b0:523:bb8a:8dca with SMTP id e3-20020a50fb83000000b00523bb8a8dcamr16285794edq.16.1693062875469; Sat, 26 Aug 2023 08:14:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693062875; cv=none; d=google.com; s=arc-20160816; b=UwbFOdozHCNJ87au7XYmqQkck2/YHWr9xyGduLCA5X3uGggzMsqxjaGG4wEaFLqqpI vMJaC3mPAVRkDSG00FYKI1z6DWFk/WMLptWyX3a7/1DtkOjFb4YDGg6JlXrF4UIUDYir WT6pT8UyL6/jGeKKOWUPPScLgR+X42y9nETOvwa7I8gHVcjTks2qJlh2iOr81rd8MFsR RftMCu5zqyAPc3fOj0xvg1NKNs0AHyHOLcV2k8llS+T8GrIGE4n9bnZyoIA0CZ1JXBIR cdgcJ4h54DLYMUVGpgqF9CVP+9mwoSJ4x0rdC82+YsIIFbb+qLqCuXLFogMTKeFmJWT6 rVug== 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=ahvz5WHlX67c2k2o2p4tefmqEPE8/p82oQOYCzf3v6E=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Gu8n089Rg3nRizVZm5t2tBOryYGsIp5xn6JPrtJgQjMoCLVW4ujHPB031B69tTtg7D EXMEuIPjyKS4+EWa+VPIAgzV4DFvD1DKefSpyeHuJaBkzlkfRhA1fyzn5o3dqml+XPyO BjnYc1Kb1xwJUOOG2iE44UuhOBjWOTDAgEH6uVKHa6VkzUuQj4LETIKDGG6NsKaFjNsA vK57ieO5cH6oh9K6eL2nqO7XE8586yn+spwsPPQjIoCJkiEb0h0Yt9QSZRzSZ/L611qX 4Z/nLEhYVz9xzNT/zL1+8Zb0cJ23Baw4LkTuqc8uXT4tqF8Ij7o6H7vAQZJzejQo4U7g 8+dg== 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 u18-20020aa7d992000000b0052a4b8075cesi324731eds.402.2023.08.26.08.14.35; Sat, 26 Aug 2023 08:14: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; 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 F18F568C702; Sat, 26 Aug 2023 18:13:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D1AAD68C5D1 for ; Sat, 26 Aug 2023 18:13:16 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id F2EE1240200 for ; Sat, 26 Aug 2023 17:13:14 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id Pk6qmSBPUpxs for ; Sat, 26 Aug 2023 17:13:14 +0200 (CEST) Received: from mail1.khirnov.net (mail1.khirnov.net [IPv6:2a00:c500:561:206::5]) (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 "mail1.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 75D09240D9B for ; Sat, 26 Aug 2023 17:13:12 +0200 (CEST) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id EA34340F8 for ; Sat, 26 Aug 2023 17:15:15 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id LCST1oQ8ErIk for ; Sat, 26 Aug 2023 17:15:15 +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 68CDF4112 for ; Sat, 26 Aug 2023 17:15:05 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 757D13A1502 for ; Sat, 26 Aug 2023 17:11:52 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Aug 2023 17:11:32 +0200 Message-Id: <20230826151144.24858-6-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230826151144.24858-1-anton@khirnov.net> References: <20230826151144.24858-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/18] fftools/ffmpeg_enc: reindent after previous commit 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: I7pq1jYhGo0U --- fftools/ffmpeg_enc.c | 66 ++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index c4874b4d78..4b5bd3d9b4 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -228,44 +228,44 @@ static int enc_choose_timebase(OutputStream *ost, AVFrame *frame) return 0; } - fr = ost->frame_rate; - if (!fr.num) - fr = fd->frame_rate_filter; - if (!fr.num && !ost->max_frame_rate.num) { - fr = (AVRational){25, 1}; - av_log(ost, AV_LOG_WARNING, - "No information " - "about the input framerate is available. Falling " - "back to a default value of 25fps. Use the -r option " - "if you want a different framerate.\n"); - } + fr = ost->frame_rate; + if (!fr.num) + fr = fd->frame_rate_filter; + if (!fr.num && !ost->max_frame_rate.num) { + fr = (AVRational){25, 1}; + av_log(ost, AV_LOG_WARNING, + "No information " + "about the input framerate is available. Falling " + "back to a default value of 25fps. Use the -r option " + "if you want a different framerate.\n"); + } - if (ost->max_frame_rate.num && - (av_q2d(fr) > av_q2d(ost->max_frame_rate) || - !fr.den)) - fr = ost->max_frame_rate; + if (ost->max_frame_rate.num && + (av_q2d(fr) > av_q2d(ost->max_frame_rate) || + !fr.den)) + fr = ost->max_frame_rate; - if (enc->codec->supported_framerates && !ost->force_fps) { - int idx = av_find_nearest_q_idx(fr, enc->codec->supported_framerates); - fr = enc->codec->supported_framerates[idx]; - } - // reduce frame rate for mpeg4 to be within the spec limits - if (enc->codec_id == AV_CODEC_ID_MPEG4) { - av_reduce(&fr.num, &fr.den, - fr.num, fr.den, 65535); - } + if (enc->codec->supported_framerates && !ost->force_fps) { + int idx = av_find_nearest_q_idx(fr, enc->codec->supported_framerates); + fr = enc->codec->supported_framerates[idx]; + } + // reduce frame rate for mpeg4 to be within the spec limits + if (enc->codec_id == AV_CODEC_ID_MPEG4) { + av_reduce(&fr.num, &fr.den, + fr.num, fr.den, 65535); + } - if (av_q2d(fr) > 1e3 && ost->vsync_method != VSYNC_PASSTHROUGH && - (ost->vsync_method == VSYNC_CFR || ost->vsync_method == VSYNC_VSCFR || - (ost->vsync_method == VSYNC_AUTO && !(of->format->flags & AVFMT_VARIABLE_FPS)))){ - av_log(ost, AV_LOG_WARNING, "Frame rate very high for a muxer not efficiently supporting it.\n" - "Please consider specifying a lower framerate, a different muxer or " - "setting vsync/fps_mode to vfr\n"); - } + if (av_q2d(fr) > 1e3 && ost->vsync_method != VSYNC_PASSTHROUGH && + (ost->vsync_method == VSYNC_CFR || ost->vsync_method == VSYNC_VSCFR || + (ost->vsync_method == VSYNC_AUTO && !(of->format->flags & AVFMT_VARIABLE_FPS)))){ + av_log(ost, AV_LOG_WARNING, "Frame rate very high for a muxer not efficiently supporting it.\n" + "Please consider specifying a lower framerate, a different muxer or " + "setting vsync/fps_mode to vfr\n"); + } - enc->framerate = fr; + enc->framerate = fr; - ost->st->avg_frame_rate = fr; + ost->st->avg_frame_rate = fr; if (!(tb.num > 0 && tb.den > 0)) tb = av_inv_q(fr);