From: Ulrik Mikaelsson <ulrik.mikaelsson@gmail.com> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Subject: Re: [FFmpeg-devel] [PATCH] avformat/mp3dec:Subtract known padding from duration Date: Wed, 23 Aug 2023 11:25:53 +0200 Message-ID: <CAC-4XGvyJqj7r_R=8FHqKdd73jugSMTwbMsKvNdGCcLmde1FOw@mail.gmail.com> (raw) In-Reply-To: <a53e9e361ddbcd0d164e2c94f03cc07b0dc9b276.camel@haerdin.se> > > --- > > libavformat/mp3dec.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c > > index 05c13228bc..c8c3b298ab 100644 > > --- a/libavformat/mp3dec.c > > +++ b/libavformat/mp3dec.c > > @@ -350,7 +350,8 @@ static int mp3_parse_vbr_tags(AVFormatContext *s, > > AVStream *st, int64_t base) > > avio_seek(s->pb, base + vbrtag_size, SEEK_SET); > > > > if (mp3->frames) > > - st->duration = av_rescale_q(mp3->frames, (AVRational){spf, > > c.sample_rate}, > > + st->duration = av_rescale_q((mp3->frames * spf) - mp3- > > >start_pad - mp3->end_pad, > > This can overflow. Casting to int64_t before multiplying should be > enough to fix it. Good catch! I also noticed a fate-test failed (due to it including padding-samples in the reference output for duration), and a formatting error in the patch itself. Will fix and resubmit. Den ons 23 aug. 2023 kl 11:18 skrev Tomas Härdin <git@haerdin.se>: > > tis 2023-08-22 klockan 14:03 +0200 skrev Ulrik Mikaelsson: > > When an Info-tag is present, marking initial and trailing samples as > > padding, those samples should not be included in the calculation of > > track > > duration. > > > > This solves a surprising user experience where converting a WAV->MP3- > > >WAV, > > ffprobe will show the duration of the mp3 as slightly longer than > > both the > > input and the output. > > I've had similar issues with burning gapless CDs. Hopefully this fixes > some downstream projects. > > > --- > > libavformat/mp3dec.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c > > index 05c13228bc..c8c3b298ab 100644 > > --- a/libavformat/mp3dec.c > > +++ b/libavformat/mp3dec.c > > @@ -350,7 +350,8 @@ static int mp3_parse_vbr_tags(AVFormatContext *s, > > AVStream *st, int64_t base) > > avio_seek(s->pb, base + vbrtag_size, SEEK_SET); > > > > if (mp3->frames) > > - st->duration = av_rescale_q(mp3->frames, (AVRational){spf, > > c.sample_rate}, > > + st->duration = av_rescale_q((mp3->frames * spf) - mp3- > > >start_pad - mp3->end_pad, > > This can overflow. Casting to int64_t before multiplying should be > enough to fix it. > > /Tomas > _______________________________________________ > 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".
prev parent reply other threads:[~2023-08-23 9:26 UTC|newest] Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-08-22 12:03 Ulrik Mikaelsson 2023-08-23 9:18 ` Tomas Härdin 2023-08-23 9:25 ` Ulrik Mikaelsson [this message]
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to='CAC-4XGvyJqj7r_R=8FHqKdd73jugSMTwbMsKvNdGCcLmde1FOw@mail.gmail.com' \ --to=ulrik.mikaelsson@gmail.com \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git