diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-11 15:50:18 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-11 15:50:18 +0100 |
| commit | 4122f932b1dc25f7a4592f49f2c9ab19d63b3a4e (patch) | |
| tree | da592cad1e8e7293d22dcc45839de2a0f11a1d68 /src/lib/audio_decoder.cc | |
| parent | bba1bd9b08eb78bda8cdf7fa1393f3eeb2a504d9 (diff) | |
Add test for audio delay, and do it in the player rather than the decoder.
Diffstat (limited to 'src/lib/audio_decoder.cc')
| -rw-r--r-- | src/lib/audio_decoder.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc index 2fe347cf2..3b97cc16f 100644 --- a/src/lib/audio_decoder.cc +++ b/src/lib/audio_decoder.cc @@ -35,17 +35,12 @@ AudioDecoder::AudioDecoder (shared_ptr<const Film> f, shared_ptr<const AudioCont : Decoder (f) , _audio_position (0) { - _delay_frames = c->audio_delay() * c->content_audio_frame_rate() * f->dcp_audio_frame_rate() / (c->output_audio_frame_rate() * 1000); + } void AudioDecoder::audio (shared_ptr<const AudioBuffers> data, AudioContent::Frame frame) { - frame += _delay_frames; - Audio (data, frame); _audio_position = frame + data->frames (); - if (_audio_position < 0) { - _audio_position = 0; - } } |
