diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-07-28 17:53:27 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-07-29 20:04:36 +0100 |
| commit | a0d1dd5d91c81ec9907cbc7b890905c463c18f62 (patch) | |
| tree | 3dc0b2e5b7e3a4e7da7d687c8713e0b461ce2aeb /src/lib/dcp_decoder.cc | |
| parent | 2da067ce01a04964dd5d739ea695504517877507 (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/dcp_decoder.cc')
| -rw-r--r-- | src/lib/dcp_decoder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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<dcp::PictureAsset> 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; } } |