diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-05-07 00:21:16 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-05-07 09:29:59 +0200 |
| commit | 49bc592d53d451ab59a8ae6f3ec74126571fb60a (patch) | |
| tree | c53c56d75c2a5cccc105009a0e6a0c9fc3a1a651 /src/lib/ffmpeg_decoder.cc | |
| parent | 1b998e92e4313e728389a39408bd67919649c5cb (diff) | |
WIP: more1771-resample-glitches-take4
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index c661240c3..5e09bb8fa 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -164,7 +164,7 @@ FFmpegDecoder::flush () auto to_do = min (full_length - a, ContentTime::from_seconds (0.1)); auto silence = make_shared<AudioBuffers>(i->channels(), to_do.frames_ceil (i->frame_rate())); silence->make_silent (); - audio->emit (film(), i, silence, a, true); + audio->emit (i, silence, a, true); a += to_do; } } @@ -479,7 +479,6 @@ FFmpegDecoder::process_audio_frame (shared_ptr<FFmpegAudioStream> stream) data->move (data->frames() - remove, remove, 0); data->set_frames (data->frames() - remove); ct += ContentTime::from_frames (remove, stream->frame_rate()); - std::cout << "FF discarded " << remove << "\n"; } if (ct < ContentTime()) { @@ -496,7 +495,7 @@ FFmpegDecoder::process_audio_frame (shared_ptr<FFmpegAudioStream> stream) /* Give this data provided there is some, and its time is sane */ if (ct >= ContentTime() && data->frames() > 0) { - audio->emit (film(), stream, data, ct); + audio->emit (stream, data, ct); } } |