summaryrefslogtreecommitdiff
path: root/src/lib/audio_decoder_stream.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-07-28 17:53:27 +0100
committerCarl Hetherington <cth@carlh.net>2015-07-29 20:04:36 +0100
commita0d1dd5d91c81ec9907cbc7b890905c463c18f62 (patch)
tree3dc0b2e5b7e3a4e7da7d687c8713e0b461ce2aeb /src/lib/audio_decoder_stream.cc
parent2da067ce01a04964dd5d739ea695504517877507 (diff)
Replace Time::frames with Time::frames_round and Time::frames_floor.
I believe both are necessary; doing floor instead of round caused #648.
Diffstat (limited to 'src/lib/audio_decoder_stream.cc')
-rw-r--r--src/lib/audio_decoder_stream.cc4
1 files changed, 2 insertions, 2 deletions
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<const AudioBuffers> 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<AudioBuffers> padded (new AudioBuffers (data->channels(), data->frames() + delta_frames));
@@ -172,7 +172,7 @@ AudioDecoderStream::audio (shared_ptr<const AudioBuffers> 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()));