From patchwork Sat Aug 26 15:11: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: 43341 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a17:906:4f0f:b0:99c:ff93:59c5 with SMTP id t15csp996339eju; Sat, 26 Aug 2023 08:14:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGaHLjpRZ8c9qIxnWWy97Vr49hM3CzKAps1bB9uquuwN4It2lKgjmsY5llCj7dHb/10ab40 X-Received: by 2002:aa7:d40d:0:b0:522:3ef1:b1d with SMTP id z13-20020aa7d40d000000b005223ef10b1dmr12988806edq.6.1693062866714; Sat, 26 Aug 2023 08:14:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693062866; cv=none; d=google.com; s=arc-20160816; b=apr4VhwJJe+TIfidqKiF0j65SavOFQPAmwh+/Zbb+Mo3E32U1A7TrDIqx8EaLIEKvt 869x1mUgf0+p8czF6JbrmAs0FeGrEWqFyB+EOTKYY5ttHjDjXJxQwP9dUvkxfcXFYcGQ 1AuFbjSuqYBci+IZ/mgzLV4cHWeKaBsKZ7KpNaWBRMlnx8h2Tw6ypl5wBHckd/tS0M7a hI9xYtwso5UUjEmUzVrQ/7SgE8UELV/oc2B8Hvu4fbmeLVwm2LPc3fNGeFvWDZuNU68h dZKcuL9oudxz2uuCtoSvPRq+vKk9j6dJBpUJ9o7BvAU389h5pHI1WA1c2l4ewDahHdMR ol6g== 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=ETAoI3YjbLgzNHzsaNOzx+mGfJP8xRbBkwuPkJkkts0=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=OSjtmtCMzK2FpZSpsunmPlFzEGrWIfSQMJ/mdzxo4vBwWaqLUBZNEQZa7pZdA2bPUY DYZV256Wx7hDOAwpZJ4jQjFn1buaWSA56P+7V0U9s8H5mbkTFRwE2boi06n93RoBEwW8 BMH9UZja1apHpIKOkRfPOT42H5VwpWQdpaDZ/696g94EOfagAPIfWytnfOMFeiecT6Ov iQud88Y2P8+tledp/0iaCtkGdV4HdzCr1oiq59Jb0joy0b9fffCxPodCYJt6JwyImQJP +TVoF2jEaQX3ZU7tB2h7Mi4RLLtMTD9lBxhTqmdR1CTCBAqJewBXSorV4H9VEW89wuqn JgOQ== 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 j8-20020aa7c0c8000000b0052a3c95becesi339774edp.284.2023.08.26.08.14.25; Sat, 26 Aug 2023 08:14: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; 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 05E6E68C6DE; 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 CCFDE68C668 for ; Sat, 26 Aug 2023 18:13:16 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 843EC2401C0 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 MKGEhzdFUlWt 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 5A5192404F7 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 A636D40F8 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 BS-NbjtnJZxO 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 6EA934118 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 AF5CD3A1585 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:37 +0200 Message-Id: <20230826151144.24858-11-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 11/18] fftools/ffmpeg_enc: move handling video frame duration to video_sync_process() 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: nrbdiv+jEWkx That is a more appropriate place for this. --- fftools/ffmpeg_enc.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index 0586ba17c4..590ce5d7be 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -968,12 +968,12 @@ early_exit: * should this (and possibly previous) frame be repeated in order to conform to * desired target framerate (if any). */ -static void video_sync_process(OutputFile *of, OutputStream *ost, - AVFrame *frame, double duration, +static void video_sync_process(OutputFile *of, OutputStream *ost, AVFrame *frame, int64_t *nb_frames, int64_t *nb_frames_prev) { Encoder *e = ost->enc; - double delta0, delta, sync_ipts; + AVCodecContext *enc = ost->enc_ctx; + double delta0, delta, sync_ipts, duration; if (!frame) { *nb_frames_prev = *nb_frames = mid_pred(e->frames_prev_hist[0], @@ -982,6 +982,8 @@ static void video_sync_process(OutputFile *of, OutputStream *ost, goto finish; } + duration = lrintf(frame->duration * av_q2d(frame->time_base) / av_q2d(enc->time_base)); + sync_ipts = adjust_frame_pts_to_encoder_tb(of, ost, frame); /* delta0 is the "drift" between the input frame and * where it would fall in the output. */ @@ -1110,12 +1112,8 @@ static int do_video_out(OutputFile *of, OutputStream *ost, AVFrame *frame) Encoder *e = ost->enc; AVCodecContext *enc = ost->enc_ctx; int64_t nb_frames, nb_frames_prev, i; - double duration = 0; - if (frame) - duration = lrintf(frame->duration * av_q2d(frame->time_base) / av_q2d(enc->time_base)); - - video_sync_process(of, ost, frame, duration, + video_sync_process(of, ost, frame, &nb_frames, &nb_frames_prev); if (nb_frames_prev == 0 && ost->last_dropped) {