diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-01-05 09:37:57 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-01-05 09:37:57 +0000 |
| commit | c8be0644833dce6ff39202430bba0ab358f3e096 (patch) | |
| tree | 1007061e5aac388825260ad1c016e8efd6f43919 /test | |
| parent | 23690fa77d69f841569b7b7e03feb55db34622bb (diff) | |
| parent | 736f9d8154080ea5837b31af623ef863eea1a7c5 (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'test')
| -rw-r--r-- | test/reels_test.cc | 2 | ||||
| -rw-r--r-- | test/seek_zero_test.cc | 2 | ||||
| -rw-r--r-- | test/util_test.cc | 39 |
3 files changed, 30 insertions, 13 deletions
diff --git a/test/reels_test.cc b/test/reels_test.cc index 51cb1f200..1951d5374 100644 --- a/test/reels_test.cc +++ b/test/reels_test.cc @@ -174,7 +174,7 @@ BOOST_AUTO_TEST_CASE (reels_test3) BOOST_CHECK_EQUAL (i->to.get(), 96000 * 3); ++i; BOOST_CHECK_EQUAL (i->from.get(), 96000 * 3); - BOOST_CHECK_EQUAL (i->to.get(), sub->full_length().round_up(film->video_frame_rate()).get()); + BOOST_CHECK_EQUAL (i->to.get(), sub->full_length().ceil(film->video_frame_rate()).get()); } /** Check creation of a multi-reel DCP with a single .srt subtitle file; diff --git a/test/seek_zero_test.cc b/test/seek_zero_test.cc index faf4c9eac..0329364d9 100644 --- a/test/seek_zero_test.cc +++ b/test/seek_zero_test.cc @@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE (seek_zero_test) video_delay = ContentTime (); } - Frame const first_frame = video_delay.round_up (content->active_video_frame_rate ()).frames_round (content->active_video_frame_rate ()); + Frame const first_frame = video_delay.ceil (content->active_video_frame_rate ()).frames_round (content->active_video_frame_rate ()); FFmpegDecoder decoder (content, film->log()); list<ContentVideo> a = decoder.video->get (first_frame, true); diff --git a/test/util_test.cc b/test/util_test.cc index 6abc9b5e7..334811cb7 100644 --- a/test/util_test.cc +++ b/test/util_test.cc @@ -51,21 +51,38 @@ BOOST_AUTO_TEST_CASE (digest_head_tail_test) BOOST_CHECK_THROW (digest_head_tail (p, 1024), OpenFileError); } -/* Straightforward test of DCPTime::round_up */ -BOOST_AUTO_TEST_CASE (dcptime_round_up_test) +/* Straightforward test of DCPTime::ceil */ +BOOST_AUTO_TEST_CASE (dcptime_ceil_test) { - BOOST_CHECK_EQUAL (DCPTime(0).round_up(DCPTime::HZ / 2).get(), 0); - BOOST_CHECK_EQUAL (DCPTime(1).round_up(DCPTime::HZ / 2).get(), 2); - BOOST_CHECK_EQUAL (DCPTime(2).round_up(DCPTime::HZ / 2).get(), 2); - BOOST_CHECK_EQUAL (DCPTime(3).round_up(DCPTime::HZ / 2).get(), 4); + BOOST_CHECK_EQUAL (DCPTime(0).ceil(DCPTime::HZ / 2).get(), 0); + BOOST_CHECK_EQUAL (DCPTime(1).ceil(DCPTime::HZ / 2).get(), 2); + BOOST_CHECK_EQUAL (DCPTime(2).ceil(DCPTime::HZ / 2).get(), 2); + BOOST_CHECK_EQUAL (DCPTime(3).ceil(DCPTime::HZ / 2).get(), 4); - BOOST_CHECK_EQUAL (DCPTime(0).round_up(DCPTime::HZ / 42).get(), 0); - BOOST_CHECK_EQUAL (DCPTime(1).round_up(DCPTime::HZ / 42).get(), 42); - BOOST_CHECK_EQUAL (DCPTime(42).round_up(DCPTime::HZ / 42).get(), 42); - BOOST_CHECK_EQUAL (DCPTime(43).round_up(DCPTime::HZ / 42).get(), 84); + BOOST_CHECK_EQUAL (DCPTime(0).ceil(DCPTime::HZ / 42).get(), 0); + BOOST_CHECK_EQUAL (DCPTime(1).ceil(DCPTime::HZ / 42).get(), 42); + BOOST_CHECK_EQUAL (DCPTime(42).ceil(DCPTime::HZ / 42).get(), 42); + BOOST_CHECK_EQUAL (DCPTime(43).ceil(DCPTime::HZ / 42).get(), 84); /* Check that rounding up to non-integer frame rates works */ - BOOST_CHECK_EQUAL (DCPTime(45312).round_up(29.976).get(), 48045); + BOOST_CHECK_EQUAL (DCPTime(45312).ceil(29.976).get(), 48038); +} + +/* Straightforward test of DCPTime::floor */ +BOOST_AUTO_TEST_CASE (dcptime_floor_test) +{ + BOOST_CHECK_EQUAL (DCPTime(0).floor(DCPTime::HZ / 2).get(), 0); + BOOST_CHECK_EQUAL (DCPTime(1).floor(DCPTime::HZ / 2).get(), 0); + BOOST_CHECK_EQUAL (DCPTime(2).floor(DCPTime::HZ / 2).get(), 2); + BOOST_CHECK_EQUAL (DCPTime(3).floor(DCPTime::HZ / 2).get(), 2); + + BOOST_CHECK_EQUAL (DCPTime(0).floor(DCPTime::HZ / 42).get(), 0); + BOOST_CHECK_EQUAL (DCPTime(1).floor(DCPTime::HZ / 42).get(), 0); + BOOST_CHECK_EQUAL (DCPTime(42).floor(DCPTime::HZ / 42.0).get(), 42); + BOOST_CHECK_EQUAL (DCPTime(43).floor(DCPTime::HZ / 42.0).get(), 42); + + /* Check that rounding down to non-integer frame rates works */ + BOOST_CHECK_EQUAL (DCPTime(45312).floor(29.976).get(), 44836); } BOOST_AUTO_TEST_CASE (timecode_test) |