diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-07-14 13:32:42 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-07-14 13:32:42 +0100 |
| commit | 295c425291c9449188106452386b103d970291db (patch) | |
| tree | 463fb2a92edc0bbc4173c49ad8634c8602727347 /test/reels_test.cc | |
| parent | 1ff0573d0ea962c6c98b956b98df37734a10cb14 (diff) | |
Fix test for new rounding of video content positions on timeline.
Diffstat (limited to 'test/reels_test.cc')
| -rw-r--r-- | test/reels_test.cc | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/test/reels_test.cc b/test/reels_test.cc index 79b4c5af2..ef1348116 100644 --- a/test/reels_test.cc +++ b/test/reels_test.cc @@ -236,16 +236,17 @@ BOOST_AUTO_TEST_CASE (reels_test5) film->examine_and_add_content (dcp); wait_for_jobs (); + /* Set to 123 but it will be rounded up to the next frame (4000) */ dcp->set_position(DCPTime(123)); { list<DCPTimePeriod> p = dcp->reels (); BOOST_REQUIRE_EQUAL (p.size(), 4); list<DCPTimePeriod>::const_iterator i = p.begin(); - BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 0), DCPTime(123 + 96000))); - BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 96000), DCPTime(123 + 192000))); - BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 192000), DCPTime(123 + 288000))); - BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 288000), DCPTime(123 + 384000))); + BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 96000))); + BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 96000), DCPTime(4000 + 192000))); + BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 192000), DCPTime(4000 + 288000))); + BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 288000), DCPTime(4000 + 384000))); } { @@ -253,10 +254,10 @@ BOOST_AUTO_TEST_CASE (reels_test5) list<DCPTimePeriod> p = dcp->reels (); BOOST_REQUIRE_EQUAL (p.size(), 4); list<DCPTimePeriod>::const_iterator i = p.begin(); - BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 0), DCPTime(123 + 48000))); - BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 48000), DCPTime(123 + 144000))); - BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 144000), DCPTime(123 + 240000))); - BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 240000), DCPTime(123 + 336000))); + BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000))); + BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 48000), DCPTime(4000 + 144000))); + BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 144000), DCPTime(4000 + 240000))); + BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 240000), DCPTime(4000 + 336000))); } { @@ -264,10 +265,10 @@ BOOST_AUTO_TEST_CASE (reels_test5) list<DCPTimePeriod> p = dcp->reels (); BOOST_REQUIRE_EQUAL (p.size(), 4); list<DCPTimePeriod>::const_iterator i = p.begin(); - BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 0), DCPTime(123 + 48000))); - BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 48000), DCPTime(123 + 144000))); - BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 144000), DCPTime(123 + 240000))); - BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 240000), DCPTime(123 + 288000))); + BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000))); + BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 48000), DCPTime(4000 + 144000))); + BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 144000), DCPTime(4000 + 240000))); + BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 240000), DCPTime(4000 + 288000))); } { @@ -275,9 +276,9 @@ BOOST_AUTO_TEST_CASE (reels_test5) list<DCPTimePeriod> p = dcp->reels (); BOOST_REQUIRE_EQUAL (p.size(), 3); list<DCPTimePeriod>::const_iterator i = p.begin(); - BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 0), DCPTime(123 + 48000))); - BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 48000), DCPTime(123 + 144000))); - BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 144000), DCPTime(123 + 192000))); + BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000))); + BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 48000), DCPTime(4000 + 144000))); + BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 144000), DCPTime(4000 + 192000))); } } |