From patchwork Wed Apr 19 19:52:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41258 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp743797pzb; Wed, 19 Apr 2023 12:53:41 -0700 (PDT) X-Google-Smtp-Source: AKy350bgQ9gCQLY+Pn6x2wkuSH2tWYtzQ2rk4JH2u+dk6uf+ON/bkOUxf9+N7hoyU2n8XcFmLUBy X-Received: by 2002:a17:906:dd2:b0:94e:e99f:ac8 with SMTP id p18-20020a1709060dd200b0094ee99f0ac8mr15906011eji.29.1681934021710; Wed, 19 Apr 2023 12:53:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681934021; cv=none; d=google.com; s=arc-20160816; b=u4MU8RoIaQAV2UXT6LiotTIPI0ne5dmFdF0H2V9WkfmwfB5LaOarfuYvALLb6z2Boa 9IevjqDZ0eXMeRjF/LA/18TJopY1vf5XupEJBOK9a5YWgp1fF6RGbfkOQ+C+GE144Yby cBDzZ/PI4SHha/7vf10CFQeQTdir4vwRb187MWfcrGpCtGpiXm8RmYIgQYV3Ljj5gUxL Eu5VJnSUAzRfVHuAivPal1OqVtqCX2q5CTZtEnPMsOzXtsYOBuIiO0YNi8dqiZwNQdg4 B9pq5nmEwj7lQ6DljbAfXC1ubjVjQiz99ofDvl1EYZvF5IFMypQ68CW1exMKL4LwSjEo 4FSw== 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=lAH58QmkN/z7o25FoXon8hQmGB51d94QBQFOclZz8zQ=; b=SfaFmlfemhLLrLOGmfoE7U0L/vut5fPWz9S1LwFRPJw0NG5qWpinr2+pADBgayAPZ3 qGrIG33uK/rAg6wLLUAoSLSzmPCXku2cNY+NvSFokOlV2snsnbd5NURKFg8XCZkJQ7Q1 psakKF0+9OmZ9wy7ukF0u8+OrhMBPh3RmXArqXHRQOX3z5F6sVQzCYqdY2ZrMMuQAcIt f6WS7sTpdp7z4xLY5UVPRHIAS8sTaeIJIhy0jF/fWoMgcJ1tBzwrz/wTCygIDg5HyaIa 4fteVr76BTVOEjp1nreN0AknkByBMlX9D7j0RcU6/nppH5mCiwr9Fe6qG8XSOsEqgxAt 6ybg== 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 vl13-20020a17090730cd00b0094fbea57d3esi5247114ejb.9.2023.04.19.12.53.41; Wed, 19 Apr 2023 12:53:41 -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 3184A68BE90; Wed, 19 Apr 2023 22:53:09 +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 1959668BE7F for ; Wed, 19 Apr 2023 22:52:59 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id CC9B72404F8 for ; Wed, 19 Apr 2023 21:52:58 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id Vqzk1wvOyiu3 for ; Wed, 19 Apr 2023 21:52:58 +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 068052405B5 for ; Wed, 19 Apr 2023 21:52:56 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 8DA193A0D93 for ; Wed, 19 Apr 2023 21:52:55 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Apr 2023 21:52:24 +0200 Message-Id: <20230419195243.2974-6-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230419195243.2974-1-anton@khirnov.net> References: <20230419195243.2974-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/25] fftools/ffmpeg_enc: move handling final frames 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: DHbJ+f4c89ut This code properly belongs there. --- fftools/ffmpeg_enc.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index e63da2ec97..859c7fdeee 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -877,9 +877,16 @@ static void video_sync_process(OutputFile *of, OutputStream *ost, int64_t *nb_frames, int64_t *nb_frames_prev) { Encoder *e = ost->enc; - double delta0, delta; + double delta0, delta, sync_ipts; - double sync_ipts = adjust_frame_pts_to_encoder_tb(of, ost, frame); + if (!frame) { + *nb_frames_prev = *nb_frames = mid_pred(e->frames_prev_hist[0], + e->frames_prev_hist[1], + e->frames_prev_hist[2]); + goto finish; + } + + 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. */ delta0 = sync_ipts - e->next_pts; @@ -940,6 +947,12 @@ static void video_sync_process(OutputFile *of, OutputStream *ost, default: av_assert0(0); } + +finish: + memmove(e->frames_prev_hist + 1, + e->frames_prev_hist, + sizeof(e->frames_prev_hist[0]) * (FF_ARRAY_ELEMS(e->frames_prev_hist) - 1)); + e->frames_prev_hist[0] = *nb_frames_prev; } static enum AVPictureType forced_kf_apply(void *logctx, KeyframeForceCtx *kf, @@ -1015,20 +1028,8 @@ static void do_video_out(OutputFile *of, OutputStream *ost, AVFrame *frame) if (duration <= 0 && frame_rate.num > 0 && frame_rate.den > 0) duration = 1/(av_q2d(frame_rate) * av_q2d(enc->time_base)); - if (!frame) { - //end, flushing - nb_frames_prev = nb_frames = mid_pred(e->frames_prev_hist[0], - e->frames_prev_hist[1], - e->frames_prev_hist[2]); - } else { - video_sync_process(of, ost, frame, duration, - &nb_frames, &nb_frames_prev); - } - - memmove(e->frames_prev_hist + 1, - e->frames_prev_hist, - sizeof(e->frames_prev_hist[0]) * (FF_ARRAY_ELEMS(e->frames_prev_hist) - 1)); - e->frames_prev_hist[0] = nb_frames_prev; + video_sync_process(of, ost, frame, duration, + &nb_frames, &nb_frames_prev); if (nb_frames_prev == 0 && ost->last_dropped) { nb_frames_drop++;