From patchwork Wed May 31 14:54:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41909 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp3327347pzb; Wed, 31 May 2023 07:55:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4QbwwhUyY+uh06YPxNXgX2Oo8lqAW6RlApPE/buwmG6i8OyFOhPhN81vMG9gPp+boge7wM X-Received: by 2002:a05:6402:b23:b0:514:8fdd:fc41 with SMTP id bo3-20020a0564020b2300b005148fddfc41mr4490002edb.15.1685544939003; Wed, 31 May 2023 07:55:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685544938; cv=none; d=google.com; s=arc-20160816; b=FZ/pAUbLGxKzXaIapiIphijjSQZ7Gz9Vc+VKadDuF1bIF2FwhDpBvVvyX1eA4UGTtk OcbVIeBydp2oYvMhAqpnbuKhHB9lRNH92zudGKk8FwwdDPzu0EDtjFLWN4Q7VxBIamDW m4OiyEnEN6YKHp0rVe8Tpw0sKl/Keucguk4XmR7YyetlWM6HbZxkOm61vim92ro5ZsrW PeNoXsQIY49hSUyQXdBBH6IsAxFGW4hkpNoX6ktP3bYiGzFPe8/tb84YSVtVBFj9BRRH Man7AXFHzly2ujRDf3WZIXBykiQm84aoJcqCdRaTAu6ohO0oF/DDcY/bd9KcpmeoF12R DmcQ== 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=e2P/BHYpfWMe7DQz7VrAtBJ5qOk9gFZL0Ljthh0sW8w=; b=cyPH5KRrll5FmkAvJAF0gyGY0dm+bN49Q4fmb2e9vHFKP0YWkUgIMWPgCXrYq64M2S zi/lveJ1/Xlp3jwYbCd1nOcCA+iipZj+j3lcPSbVLGG3Z+3tFiKhLb4Dvf4HfX1naI68 ZR5/6B5daIcCgH/5JiLrK423W4pqSG2a5XQ4sTTBF0JJ4nuspCHMcQSCmeq/Cs01vc8C JSvr4atSFB+Q9Tc+kiCQLbxsuDcn8QFuFTThQrHcxlEciseTkmCX5UW8YkR5xzylx5Zs vfFQhXWWoClzmIpRKqOVNRtBrnuNMlQwV4Cj2jK0JgRSb84f6mY691Ry5JOCxzXrf7qG wecg== 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 c8-20020a056402120800b00514b3b9977bsi1981116edw.297.2023.05.31.07.55.38; Wed, 31 May 2023 07:55:38 -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 4496E68C26F; Wed, 31 May 2023 17:55:16 +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 65D5168C1CE for ; Wed, 31 May 2023 17:55:07 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 333FE2404EE for ; Wed, 31 May 2023 16:55:07 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id eS1-bbYN7QoB for ; Wed, 31 May 2023 16:55:06 +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 mail0.khirnov.net (Postfix) with ESMTPS id A3C062404F5 for ; Wed, 31 May 2023 16:55:05 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 196D03A05CB for ; Wed, 31 May 2023 16:55:00 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 May 2023 16:54:37 +0200 Message-Id: <20230531145453.20994-7-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230531145453.20994-1-anton@khirnov.net> References: <20230531145453.20994-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/23] fftools/ffmpeg_mux_init: do not overwrite OutputStream.frame_rate for streamcopy 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: resehAr8zuab The values currently written into it are not used after streamcopy_init(), so it is better to confine them to that function. --- fftools/ffmpeg_mux_init.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 33c93e40f2..b5295ad445 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -861,6 +861,9 @@ static int streamcopy_init(const Muxer *mux, OutputStream *ost) AVCodecContext *codec_ctx = NULL; AVDictionary *codec_opts = NULL; + + AVRational fr = ost->frame_rate; + int ret = 0; codec_ctx = avcodec_alloc_context3(NULL); @@ -893,11 +896,11 @@ static int streamcopy_init(const Muxer *mux, OutputStream *ost) par->codec_tag = codec_tag; - if (!ost->frame_rate.num) - ost->frame_rate = ist->framerate; + if (!fr.num) + fr = ist->framerate; - if (ost->frame_rate.num) - ost->st->avg_frame_rate = ost->frame_rate; + if (fr.num) + ost->st->avg_frame_rate = fr; else ost->st->avg_frame_rate = ist->st->avg_frame_rate; @@ -908,8 +911,8 @@ static int streamcopy_init(const Muxer *mux, OutputStream *ost) // copy timebase while removing common factors if (ost->st->time_base.num <= 0 || ost->st->time_base.den <= 0) { - if (ost->frame_rate.num) - ost->st->time_base = av_inv_q(ost->frame_rate); + if (fr.num) + ost->st->time_base = av_inv_q(fr); else ost->st->time_base = av_add_q(av_stream_get_codec_timebase(ost->st), (AVRational){0, 1}); }