X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fplay_test.cc;h=ed3e497ed6e3c4fc6248537ad1e98f7d22ce1241;hb=e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160;hp=5ffc55a8ee8e3b7488044a1319b3da2137d20c8a;hpb=1b1bc528ee5ca1fee1bd33f9fb6f79cd551e3b33;p=dcpomatic.git diff --git a/test/play_test.cc b/test/play_test.cc index 5ffc55a8e..ed3e497ed 100644 --- a/test/play_test.cc +++ b/test/play_test.cc @@ -89,18 +89,18 @@ BOOST_AUTO_TEST_CASE (play_test) film->examine_and_add_content (A); wait_for_jobs (); - BOOST_CHECK_EQUAL (A->video_length(), 16); + BOOST_CHECK_EQUAL (A->video_length_after_3d_combine().frames (24), 16); shared_ptr B (new FFmpegContent (film, "test/data/red_30.mp4")); film->examine_and_add_content (B); wait_for_jobs (); - BOOST_CHECK_EQUAL (B->video_length(), 16); + BOOST_CHECK_EQUAL (B->video_length_after_3d_combine().frames (30), 16); /* Film should have been set to 25fps */ BOOST_CHECK_EQUAL (film->video_frame_rate(), 25); - BOOST_CHECK_EQUAL (A->position(), 0); + BOOST_CHECK_EQUAL (A->position(), DCPTime ()); /* A is 16 frames long at 25 fps */ BOOST_CHECK_EQUAL (B->position(), DCPTime::from_frames (16, 25));