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 522544495C for ; Wed, 28 Sep 2022 09:59:13 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1988068BC16; Wed, 28 Sep 2022 12:58:17 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9754868BBE9 for ; Wed, 28 Sep 2022 12:58:07 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id EB500240591 for ; Wed, 28 Sep 2022 11:58:03 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id K0ZlBeBnWMWX for ; Wed, 28 Sep 2022 11:58:03 +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 36D7B2405EC for ; Wed, 28 Sep 2022 11:58:01 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 47BD73A169F for ; Wed, 28 Sep 2022 11:58:01 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Sep 2022 11:55:55 +0200 Message-Id: <20220928095556.28209-8-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220928095556.28209-1-anton@khirnov.net> References: <20220928095556.28209-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 8/9] fftools/ffmpeg: rename OutputStream.sync_opts to next_pts 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: The current name is confusing. --- fftools/ffmpeg.c | 22 ++++++++++++---------- fftools/ffmpeg.h | 6 +++--- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 40c01b1c65..6deca8bfbf 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1044,12 +1044,12 @@ static void do_audio_out(OutputFile *of, OutputStream *ost, adjust_frame_pts_to_encoder_tb(of, ost, frame); - if (!check_recording_time(ost, ost->sync_opts, ost->enc_ctx->time_base)) + if (!check_recording_time(ost, ost->next_pts, ost->enc_ctx->time_base)) return; if (frame->pts == AV_NOPTS_VALUE) - frame->pts = ost->sync_opts; - ost->sync_opts = frame->pts + frame->nb_samples; + frame->pts = ost->next_pts; + ost->next_pts = frame->pts + frame->nb_samples; ret = submit_encode_frame(of, ost, frame); if (ret < 0 && ret != AVERROR_EOF) @@ -1230,7 +1230,9 @@ static void do_video_out(OutputFile *of, ost->last_nb0_frames[1], ost->last_nb0_frames[2]); } else { - delta0 = sync_ipts - ost->sync_opts; // delta0 is the "drift" between the input frame (next_picture) and where it would fall in the output. + /* delta0 is the "drift" between the input frame (next_picture) and + * where it would fall in the output. */ + delta0 = sync_ipts - ost->next_pts; delta = delta0 + duration; /* by default, we output a single frame */ @@ -1245,7 +1247,7 @@ static void do_video_out(OutputFile *of, av_log(NULL, AV_LOG_VERBOSE, "Past duration %f too large\n", -delta0); } else av_log(NULL, AV_LOG_DEBUG, "Clipping frame in rate conversion by %f\n", -delta0); - sync_ipts = ost->sync_opts; + sync_ipts = ost->next_pts; duration += delta0; delta0 = 0; } @@ -1256,7 +1258,7 @@ static void do_video_out(OutputFile *of, av_log(NULL, AV_LOG_DEBUG, "Not duplicating %d initial frames\n", (int)lrintf(delta0)); delta = duration; delta0 = 0; - ost->sync_opts = llrint(sync_ipts); + ost->next_pts = llrint(sync_ipts); } case VSYNC_CFR: // FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c @@ -1275,13 +1277,13 @@ static void do_video_out(OutputFile *of, if (delta <= -0.6) nb_frames = 0; else if (delta > 0.6) - ost->sync_opts = llrint(sync_ipts); + ost->next_pts = llrint(sync_ipts); next_picture->duration = duration; break; case VSYNC_DROP: case VSYNC_PASSTHROUGH: next_picture->duration = duration; - ost->sync_opts = llrint(sync_ipts); + ost->next_pts = llrint(sync_ipts); break; default: av_assert0(0); @@ -1335,7 +1337,7 @@ static void do_video_out(OutputFile *of, if (!in_picture) return; - in_picture->pts = ost->sync_opts; + in_picture->pts = ost->next_pts; if (!check_recording_time(ost, in_picture->pts, ost->enc_ctx->time_base)) return; @@ -1347,7 +1349,7 @@ static void do_video_out(OutputFile *of, if (ret < 0 && ret != AVERROR_EOF) exit_program(1); - ost->sync_opts++; + ost->next_pts++; ost->vsync_frame_number++; } diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index a9883c0442..d466a1ff9f 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -492,9 +492,9 @@ typedef struct OutputStream { AVStream *st; /* stream in the output file */ /* number of frames emitted by the video-encoding sync code */ int64_t vsync_frame_number; - /* input pts and corresponding output pts - for A/V sync */ - int64_t sync_opts; /* output frame counter, could be changed to some true timestamp */ // FIXME look at frame_number + /* predicted pts of the next frame to be encoded + * audio/video encoding only */ + int64_t next_pts; /* dts of the last packet sent to the muxing queue, in AV_TIME_BASE_Q */ int64_t last_mux_dts; /* pts of the last frame received from the filters, in AV_TIME_BASE_Q */ -- 2.35.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".