X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fvideo_level_test.cc;h=88fb2390cfc38810951ee86fc34f99820bff822a;hb=3de828ef40c7b7c94c050bec4db57e6151787019;hp=0de6e17b35d73671031dacf05f1fe04a0b39ebe5;hpb=49b655d3e1937018c46ed7f6a62e1157b247e426;p=dcpomatic.git diff --git a/test/video_level_test.cc b/test/video_level_test.cc index 0de6e17b3..88fb2390c 100644 --- a/test/video_level_test.cc +++ b/test/video_level_test.cc @@ -401,8 +401,7 @@ static pair dcp_range (shared_ptr film) { - film->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs()); + make_and_verify_dcp (film); return pixel_range (film->dir(film->dcp_name())); } @@ -438,7 +437,7 @@ BOOST_AUTO_TEST_CASE (movie_V_to_dcp) pair range = dcp_range (movie_V("movie_V_to_dcp")); /* Video range has been correctly expanded to full for the DCP */ BOOST_CHECK_EQUAL (range.first, 0); - BOOST_CHECK_EQUAL (range.second, 4085); + BOOST_CHECK_EQUAL (range.second, 4083); } @@ -448,8 +447,8 @@ BOOST_AUTO_TEST_CASE (movie_VoF_to_dcp) /* We said that video range data was really full range, so here we are in the DCP * with video-range data. */ - BOOST_CHECK_EQUAL (range.first, 348); - BOOST_CHECK_EQUAL (range.second, 3833); + BOOST_CHECK_EQUAL (range.first, 350); + BOOST_CHECK_EQUAL (range.second, 3832); } @@ -458,7 +457,7 @@ BOOST_AUTO_TEST_CASE (movie_F_to_dcp) pair range = dcp_range (movie_F("movie_F_to_dcp")); /* The nearly-full-range of the input has been preserved */ BOOST_CHECK_EQUAL (range.first, 0); - BOOST_CHECK_EQUAL (range.second, 4085); + BOOST_CHECK_EQUAL (range.second, 4083); } @@ -475,15 +474,15 @@ BOOST_AUTO_TEST_CASE (image_F_to_dcp) { pair range = dcp_range (image_F("image_F_to_dcp")); BOOST_CHECK_EQUAL (range.first, 0); - BOOST_CHECK_EQUAL (range.second, 4085); + BOOST_CHECK_EQUAL (range.second, 4083); } BOOST_AUTO_TEST_CASE (image_FoV_to_dcp) { pair range = dcp_range (image_FoV("image_FoV_to_dcp")); - BOOST_CHECK_EQUAL (range.first, 429); - BOOST_CHECK_EQUAL (range.second, 4014); + BOOST_CHECK_EQUAL (range.first, 430); + BOOST_CHECK_EQUAL (range.second, 4012); }