diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/client_server_test.cc | 8 | ||||
| -rw-r--r-- | test/dcpomatic_time_test.cc | 2 | ||||
| -rw-r--r-- | test/markers_test.cc | 4 | ||||
| -rw-r--r-- | test/player_test.cc | 4 | ||||
| -rw-r--r-- | test/shuffler_test.cc | 2 | ||||
| -rw-r--r-- | test/util_test.cc | 2 |
6 files changed, 12 insertions, 10 deletions
diff --git a/test/client_server_test.cc b/test/client_server_test.cc index 43084bf31..c2f31c638 100644 --- a/test/client_server_test.cc +++ b/test/client_server_test.cc @@ -114,7 +114,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) auto frame = make_shared<DCPVideo> ( pvf, 0, - 24, + dcp::Fraction(24, 1), 200000000, Resolution::TWO_K ); @@ -193,7 +193,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) auto frame = make_shared<DCPVideo>( pvf, 0, - 24, + dcp::Fraction(24, 1), 200000000, Resolution::TWO_K ); @@ -257,7 +257,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k) auto raw_frame = make_shared<DCPVideo> ( raw_pvf, 0, - 24, + dcp::Fraction(24, 1), 200000000, Resolution::TWO_K ); @@ -282,7 +282,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k) auto j2k_frame = make_shared<DCPVideo> ( j2k_pvf, 0, - 24, + dcp::Fraction(24, 1), 200000000, Resolution::TWO_K ); diff --git a/test/dcpomatic_time_test.cc b/test/dcpomatic_time_test.cc index 5d23f2478..a69f56d6f 100644 --- a/test/dcpomatic_time_test.cc +++ b/test/dcpomatic_time_test.cc @@ -35,7 +35,7 @@ using namespace dcpomatic; BOOST_AUTO_TEST_CASE (dcpomatic_time_test) { - FrameRateChange frc (24, 48); + FrameRateChange frc(24, {48, 1}); int j = 0; int k = 0; for (int64_t i = 0; i < 62000; i += 2000) { diff --git a/test/markers_test.cc b/test/markers_test.cc index 38137223f..795862efc 100644 --- a/test/markers_test.cc +++ b/test/markers_test.cc @@ -61,10 +61,10 @@ BOOST_AUTO_TEST_CASE (automatic_ffoc_lfoc_markers_test1) auto ffoc = markers->get (dcp::Marker::FFOC); BOOST_REQUIRE (ffoc); - BOOST_CHECK (*ffoc == dcp::Time(0, 0, 0, 1, 24)); + BOOST_CHECK(*ffoc == 1); auto lfoc = markers->get (dcp::Marker::LFOC); BOOST_REQUIRE (lfoc); - BOOST_CHECK (*lfoc == dcp::Time(0, 0, 9, 23, 24)); + BOOST_CHECK(*lfoc == 239); } diff --git a/test/player_test.cc b/test/player_test.cc index 43d6aa9b9..7349a5502 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -147,7 +147,7 @@ BOOST_AUTO_TEST_CASE (player_subframe_test) auto A = content_factory("test/data/flat_red.png")[0]; auto B = content_factory("test/data/awkward_length.wav")[0]; auto film = new_test_film("reels_test7", { A, B }); - film->set_video_frame_rate (24); + film->set_video_frame_rate(24); A->video->set_length (3 * 24); BOOST_CHECK (A->full_length(film) == DCPTime::from_frames(3 * 24, 24)); @@ -431,7 +431,7 @@ BOOST_AUTO_TEST_CASE (player_silence_at_end_crash) auto content1 = content_factory("test/data/flat_red.png")[0]; auto film1 = new_test_film("player_silence_at_end_crash_1", {content1}); content1->video->set_length (25); - film1->set_video_frame_rate (25); + film1->set_video_frame_rate(25); make_and_verify_dcp (film1); /* Make another project importing this DCP */ diff --git a/test/shuffler_test.cc b/test/shuffler_test.cc index 37d6749c3..f13c415ed 100644 --- a/test/shuffler_test.cc +++ b/test/shuffler_test.cc @@ -39,7 +39,7 @@ using namespace dcpomatic; static void push(Shuffler& s, int frame, Eyes eyes) { - auto piece = make_shared<Piece>(shared_ptr<Content>(), shared_ptr<Decoder>(), FrameRateChange(24, 24)); + auto piece = make_shared<Piece>(shared_ptr<Content>(), shared_ptr<Decoder>(), FrameRateChange(24, dcp::Fraction(24, 1))); ContentVideo cv; cv.time = ContentTime::from_frames(frame, 24); cv.eyes = eyes; diff --git a/test/util_test.cc b/test/util_test.cc index defc7f907..e3ded239c 100644 --- a/test/util_test.cc +++ b/test/util_test.cc @@ -96,8 +96,10 @@ BOOST_AUTO_TEST_CASE(time_to_hmsf_test) BOOST_CHECK_EQUAL(time_to_hmsf(DCPTime::from_frames(12, 24), 24), "00:00:00.12"); BOOST_CHECK_EQUAL(time_to_hmsf(DCPTime::from_frames(24, 24), 24), "00:00:01.00"); BOOST_CHECK_EQUAL(time_to_hmsf(DCPTime::from_frames(32, 24), 24), "00:00:01.08"); + BOOST_CHECK_EQUAL(time_to_hmsf(DCPTime::from_frames(32, dcp::Fraction(200, 11)), dcp::Fraction(200, 11)), "00:00:01.08"); BOOST_CHECK_EQUAL(time_to_hmsf(DCPTime::from_seconds(92), 24), "00:01:32.00"); BOOST_CHECK_EQUAL(time_to_hmsf(DCPTime::from_seconds(2 * 60 * 60 + 92), 24), "02:01:32.00"); + BOOST_CHECK_EQUAL(time_to_hmsf(DCPTime::from_seconds(2 * 60 * 60 + 92), dcp::Fraction(200, 11)), "02:01:32.00"); } |