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 6680E455CE for ; Sun, 9 Jul 2023 08:52:02 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3765C68C59F; Sun, 9 Jul 2023 11:52:00 +0300 (EEST) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7657868C4BE for ; Sun, 9 Jul 2023 11:51:53 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id C84C7E8C5E for ; Sun, 9 Jul 2023 10:48:44 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y6IPAE9kdD-2 for ; Sun, 9 Jul 2023 10:48:42 +0200 (CEST) Received: from iq (iq [217.27.212.140]) by iq.passwd.hu (Postfix) with ESMTPS id 85167E8C55 for ; Sun, 9 Jul 2023 10:48:42 +0200 (CEST) Date: Sun, 9 Jul 2023 10:48:42 +0200 (CEST) From: Marton Balint To: FFmpeg development discussions and patches In-Reply-To: <20230703221306.582-1-cus@passwd.hu> Message-ID: <34a2d3b-deaf-ba6c-b7bf-345435d975@passwd.hu> References: <20230703221306.582-1-cus@passwd.hu> MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH] fftools/ffmpeg: fix negative timestamps at the beginning of the encoding 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Tue, 4 Jul 2023, Marton Balint wrote: > Also fix a couple of possible overflows while at it. > > Fixes the negative initial timestamps in ticket #10358. Will apply. Regards, Marton > > Signed-off-by: Marton Balint > --- > fftools/ffmpeg.c | 26 +++++++++++++------------- > 1 file changed, 13 insertions(+), 13 deletions(-) > > diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c > index 435e12a37b..71d4067a6c 100644 > --- a/fftools/ffmpeg.c > +++ b/fftools/ffmpeg.c > @@ -497,11 +497,12 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti > int vid; > double bitrate; > double speed; > - int64_t pts = INT64_MIN + 1; > + int64_t pts = AV_NOPTS_VALUE; > static int64_t last_time = -1; > static int first_report = 1; > uint64_t nb_frames_dup = 0, nb_frames_drop = 0; > - int hours, mins, secs, us; > + int mins, secs, us; > + int64_t hours; > const char *hours_sign; > int ret; > float t; > @@ -553,7 +554,8 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti > } > /* compute min output value */ > if (ost->last_mux_dts != AV_NOPTS_VALUE) { > - pts = FFMAX(pts, ost->last_mux_dts); > + if (pts == AV_NOPTS_VALUE || ost->last_mux_dts > pts) > + pts = ost->last_mux_dts; > if (copy_ts) { > if (copy_ts_first_pts == AV_NOPTS_VALUE && pts > 1) > copy_ts_first_pts = pts; > @@ -566,23 +568,21 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti > nb_frames_drop += ost->last_dropped; > } > > - secs = FFABS(pts) / AV_TIME_BASE; > - us = FFABS(pts) % AV_TIME_BASE; > - mins = secs / 60; > - secs %= 60; > - hours = mins / 60; > - mins %= 60; > + us = FFABS64U(pts) % AV_TIME_BASE; > + secs = FFABS64U(pts) / AV_TIME_BASE % 60; > + mins = FFABS64U(pts) / AV_TIME_BASE / 60 % 60; > + hours = FFABS64U(pts) / AV_TIME_BASE / 3600; > hours_sign = (pts < 0) ? "-" : ""; > > - bitrate = pts && total_size >= 0 ? total_size * 8 / (pts / 1000.0) : -1; > - speed = t != 0.0 ? (double)pts / AV_TIME_BASE / t : -1; > + bitrate = pts != AV_NOPTS_VALUE && pts && total_size >= 0 ? total_size * 8 / (pts / 1000.0) : -1; > + speed = pts != AV_NOPTS_VALUE && t != 0.0 ? (double)pts / AV_TIME_BASE / t : -1; > > if (total_size < 0) av_bprintf(&buf, "size=N/A time="); > else av_bprintf(&buf, "size=%8.0fkB time=", total_size / 1024.0); > if (pts == AV_NOPTS_VALUE) { > av_bprintf(&buf, "N/A "); > } else { > - av_bprintf(&buf, "%s%02d:%02d:%02d.%02d ", > + av_bprintf(&buf, "%s%02"PRId64":%02d:%02d.%02d ", > hours_sign, hours, mins, secs, (100 * us) / AV_TIME_BASE); > } > > @@ -603,7 +603,7 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti > } else { > av_bprintf(&buf_script, "out_time_us=%"PRId64"\n", pts); > av_bprintf(&buf_script, "out_time_ms=%"PRId64"\n", pts); > - av_bprintf(&buf_script, "out_time=%s%02d:%02d:%02d.%06d\n", > + av_bprintf(&buf_script, "out_time=%s%02"PRId64":%02d:%02d.%06d\n", > hours_sign, hours, mins, secs, us); > } > > -- > 2.35.3 > > _______________________________________________ > 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". > _______________________________________________ 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".