From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 3F6B447677 for ; Tue, 19 Sep 2023 19:21:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E4FFB68C907; Tue, 19 Sep 2023 22:21:00 +0300 (EEST) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 141BD68C8ED for ; Tue, 19 Sep 2023 22:20:53 +0300 (EEST) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id B2B7B10 for ; Tue, 19 Sep 2023 21:20:52 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id ZWu8rJA88GHj for ; Tue, 19 Sep 2023 21:20:47 +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 2C50B5103 for ; Tue, 19 Sep 2023 21:20:42 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 16F513A150F for ; Tue, 19 Sep 2023 21:20:42 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Sep 2023 21:10:29 +0200 Message-Id: <20230919191044.18873-3-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230919191044.18873-1-anton@khirnov.net> References: <20230919191044.18873-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/27] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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 9b8b3e0226..9aa00f682c 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -965,12 +965,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], @@ -979,6 +979,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. */ @@ -1107,12 +1109,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) { -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".