From a0d1dd5d91c81ec9907cbc7b890905c463c18f62 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 28 Jul 2015 17:53:27 +0100 Subject: Replace Time::frames with Time::frames_round and Time::frames_floor. I believe both are necessary; doing floor instead of round caused #648. --- src/lib/audio_decoder_stream.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/audio_decoder_stream.cc') diff --git a/src/lib/audio_decoder_stream.cc b/src/lib/audio_decoder_stream.cc index fdcebbc9f..36274b502 100644 --- a/src/lib/audio_decoder_stream.cc +++ b/src/lib/audio_decoder_stream.cc @@ -145,7 +145,7 @@ AudioDecoderStream::audio (shared_ptr data, ContentTime time if (_seek_reference) { /* We've had an accurate seek and now we're seeing some data */ ContentTime const delta = time - _seek_reference.get (); - Frame const delta_frames = delta.frames (frame_rate); + Frame const delta_frames = delta.frames_round (frame_rate); if (delta_frames > 0) { /* This data comes after the seek time. Pad the data with some silence. */ shared_ptr padded (new AudioBuffers (data->channels(), data->frames() + delta_frames)); @@ -172,7 +172,7 @@ AudioDecoderStream::audio (shared_ptr data, ContentTime time } if (!_position) { - _position = time.frames (frame_rate); + _position = time.frames_round (frame_rate); } DCPOMATIC_ASSERT (_position.get() >= (_decoded.frame + _decoded.audio->frames())); -- cgit v1.2.3