1. ffmpeg
  2. Commit 49e766aa4c3d2d754bc202b87d762b041e50a449
Browse code

Revert "lavf/mp3dec: don't adjust start time; packets are not adjusted."

This causes regressions in end to end timestamps with mp3s and ffmpeg.
The revert is to avoid this regression in the 4.3 release

See: [FFmpeg-devel] [PATCH] Don't adjust start time for MP3 files; packets are not adjusted.

This reverts commit 460132c9980f8a1f501a1f69477bca49e1641233.

Michael Niedermayer authored on 2020/06/09 05:08:37
Showing 2 changed files
libavformat/mp3dec.c
History View file @ 49e766a
... ... 
@@ -260,6 +260,10 @@ static void mp3_parse_info_tag(AVFormatContext *s, AVStream *st,
260 260 
             st->first_discard_sample = -mp3->end_pad + 528 + 1 + mp3->frames * (int64_t)spf;
261 261 
             st->last_discard_sample = mp3->frames * (int64_t)spf;
262 262 
         }
263 
+        if (!st->start_time)
264 
+            st->start_time = av_rescale_q(st->start_skip_samples,
265 
+                                            (AVRational){1, c->sample_rate},
266 
+                                            st->time_base);
263 267 
         av_log(s, AV_LOG_DEBUG, "pad %d %d\n", mp3->start_pad, mp3->  end_pad);
264 268 
     }
265 269
tests/ref/fate/gapless-mp3
History View file @ 49e766a
... ... 
@@ -1,4 +1,4 @@
1 
-ec876434ed65e338e07234e54d136caf *tests/data/fate/gapless-mp3.out-1
1 
+44b42cc3a898b45507d856d0813f4f26 *tests/data/fate/gapless-mp3.out-1
2 2 
 c96c3ae7bd3300fd2f4debac222de5b7
3 3 
 ec876434ed65e338e07234e54d136caf *tests/data/fate/gapless-mp3.out-2
4 4 
 c96c3ae7bd3300fd2f4debac222de5b7