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/dcp_decoder.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/dcp_decoder.cc') diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index 44450f7d9..053ff4f68 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -64,7 +64,7 @@ DCPDecoder::pass () } double const vfr = _dcp_content->video_frame_rate (); - int64_t const frame = _next.frames (vfr); + int64_t const frame = _next.frames_round (vfr); if ((*_reel)->main_picture ()) { shared_ptr asset = (*_reel)->main_picture()->asset (); @@ -127,7 +127,7 @@ DCPDecoder::pass () _next += ContentTime::from_frames (1, vfr); if ((*_reel)->main_picture ()) { - if (_next.frames (vfr) >= (*_reel)->main_picture()->duration()) { + if (_next.frames_round (vfr) >= (*_reel)->main_picture()->duration()) { ++_reel; } } -- cgit v1.2.3