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 D658747B37 for ; Mon, 2 Oct 2023 19:03:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5D43968CB86; Mon, 2 Oct 2023 22:03:41 +0300 (EEST) Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6061868CB0C for ; Mon, 2 Oct 2023 22:03:35 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 851E320003 for ; Mon, 2 Oct 2023 19:03:34 +0000 (UTC) Date: Mon, 2 Oct 2023 21:03:33 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20231002190333.GV3543730@pb2> References: <20230929232001.23197-1-michael@niedermayer.cc> <47b96a8-db6b-aa20-d48-a6d60f0e84e@passwd.hu> <20230930140403.GK3543730@pb2> <20230930143143.GL3543730@pb2> <169610511838.6638.13529422310033823704@lain.khirnov.net> <20230930222856.GN3543730@pb2> <169623766726.6638.12142285893799599279@lain.khirnov.net> MIME-Version: 1.0 In-Reply-To: <169623766726.6638.12142285893799599279@lain.khirnov.net> X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH 1/6] avformat/avidec: support huge durations 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: multipart/mixed; boundary="===============2365793928493655335==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============2365793928493655335== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="GZxc/eAcyN/xQwfo" Content-Disposition: inline --GZxc/eAcyN/xQwfo Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Oct 02, 2023 at 11:07:47AM +0200, Anton Khirnov wrote: > Quoting Michael Niedermayer (2023-10-01 00:28:56) > > On Sat, Sep 30, 2023 at 10:18:38PM +0200, Anton Khirnov wrote: > > > Quoting Michael Niedermayer (2023-09-30 16:31:43) > > > > On Sat, Sep 30, 2023 at 04:04:03PM +0200, Michael Niedermayer wrote: > > > > > On Sat, Sep 30, 2023 at 11:35:19AM +0200, Marton Balint wrote: > > > > > >=20 > > > > > >=20 > > > > > > On Sat, 30 Sep 2023, Michael Niedermayer wrote: > > > > > >=20 > > > > > > > Fixes: signed integer overflow: 109817402400 * 301990077 cann= ot be represented in type 'long long' > > > > > > > Fixes: 51896/clusterfuzz-testcase-minimized-ffmpeg_dem_AVI_fu= zzer-6706191715139584 > > > > > > >=20 > > > > > > > Found-by: continuous fuzzing process https://github.com/googl= e/oss-fuzz/tree/master/projects/ffmpeg > > > > > > > Signed-off-by: Michael Niedermayer > > > > > > > --- > > > > > > > libavformat/avidec.c | 12 ++++++++++-- > > > > > > > 1 file changed, 10 insertions(+), 2 deletions(-) > > > > > > >=20 > > > > > > > diff --git a/libavformat/avidec.c b/libavformat/avidec.c > > > > > > > index 00bd7a98a9d..cfc693842b7 100644 > > > > > > > --- a/libavformat/avidec.c > > > > > > > +++ b/libavformat/avidec.c > > > > > > > @@ -27,6 +27,7 @@ > > > > > > > #include "libavutil/avstring.h" > > > > > > > #include "libavutil/opt.h" > > > > > > > #include "libavutil/dict.h" > > > > > > > +#include "libavutil/integer.h" > > > > > > > #include "libavutil/internal.h" > > > > > > > #include "libavutil/intreadwrite.h" > > > > > > > #include "libavutil/mathematics.h" > > > > > > > @@ -476,7 +477,7 @@ static int calculate_bitrate(AVFormatCont= ext *s) > > > > > > > AVStream *st =3D s->streams[i]; > > > > > > > FFStream *const sti =3D ffstream(st); > > > > > > > int64_t duration; > > > > > > > - int64_t bitrate; > > > > > > > + int64_t bitrate =3D 0; > > > > > > >=20 > > > > > > > for (j =3D 0; j < sti->nb_index_entries; j++) > > > > > > > len +=3D sti->index_entries[j].size; > > > > > > > @@ -484,7 +485,14 @@ static int calculate_bitrate(AVFormatCon= text *s) > > > > > > > if (sti->nb_index_entries < 2 || st->codecpar->bit_ra= te > 0) > > > > > > > continue; > > > > > > > duration =3D sti->index_entries[j-1].timestamp - sti-= >index_entries[0].timestamp; > > > > > > > - bitrate =3D av_rescale(8*len, st->time_base.den, dur= ation * st->time_base.num); > > > > > > > + if (INT64_MAX / duration >=3D st->time_base.num) { > > > > > > > + bitrate =3D av_rescale(8*len, st->time_base.den,= duration * st->time_base.num); > > > > > >=20 > > > > > > Why not always use the AVInteger version? This is not performan= ce sensitive > > > > > > as far as I see. > > > > >=20 > > > > > We can, i will have to fix the rounding though so it matches av_r= escale() > > > >=20 > > > > will apply this with just AVInteger and fixed rounding with my next= push probably > > >=20 > > > This seems MUCH less readable to me. > >=20 > > we can add a av_rescale_2den() >=20 > Won't av_rescale_q(len, (AVRational){8, duration}, st->time_base) > achieve the same effect? duration is 64bit AVRational is 32/32 bit, so i would expect that to not work. If duration was fitting in 32bit then duration * st->time_base.num would not have overflowed thx [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB If the United States is serious about tackling the national security threat= s=20 related to an insecure 5G network, it needs to rethink the extent to which = it values corporate profits and government espionage over security.-Bruce Schn= eier --GZxc/eAcyN/xQwfo Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEIAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZRsUBQAKCRBhHseHBAsP q1dcAJ9FiQvAkrjQz1hrS6fu9rbteXWZmQCdFLBD1029QH04swJbeRepW6zndIk= =8WyT -----END PGP SIGNATURE----- --GZxc/eAcyN/xQwfo-- --===============2365793928493655335== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --===============2365793928493655335==--