summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-11-29 00:51:38 +0100
committerCarl Hetherington <cth@carlh.net>2020-12-03 00:23:38 +0100
commit8798bfab1539c3ac6031bb325e1b181c58b13fc5 (patch)
tree9352ecbe44b970855513e85b7e24854b7628d87f /src/lib/ffmpeg_decoder.cc
parent5000e8b9dfe2807926e8fe1cb2dfc42ca319c7f6 (diff)
Obey audio timestamps if they don't deviate by more than some threshold.
Previously we would ignore audio timestamps because they are not contiguous in a sample-accurate way. However with bugs like #1833 we do need to obey large discontinuities in audio timestamps, otherwise we get large sync errors. Here we change timestamp handling to ignore small discontinuities in timestamps but not larger ones.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
-rw-r--r--src/lib/ffmpeg_decoder.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 41b93dad7..0d6539061 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -145,7 +145,7 @@ FFmpegDecoder::flush ()
ContentTime to_do = min (full_length - a, ContentTime::from_seconds (0.1));
shared_ptr<AudioBuffers> silence (new AudioBuffers (i->channels(), to_do.frames_ceil (i->frame_rate())));
silence->make_silent ();
- audio->emit (film(), i, silence, a);
+ audio->emit (film(), i, silence, a, true);
a += to_do;
}
}