X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fplayer_test.cc;h=9194b84bbbf52f0e97e22eabf8f5263de6cb5f11;hb=12da8c3da906dbc40cf01b745b3be66c9302c2e0;hp=6dd78dbb298adaff8e3fc4110c99fe6202afc64d;hpb=5d937606cf96d163be98920fa5619114a28eec9d;p=dcpomatic.git diff --git a/test/player_test.cc b/test/player_test.cc index 6dd78dbb2..9194b84bb 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -46,9 +46,12 @@ using std::cout; using std::list; using std::pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::bind; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; static shared_ptr accumulated; @@ -215,7 +218,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test) player->set_always_burn_open_subtitles (); player->set_play_referenced (); - shared_ptr butler (new Butler (player, AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)); + shared_ptr butler (new Butler (film, player, AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, false, true)); butler->disable_audio(); for (int i = 0; i < 10; ++i) { @@ -223,12 +226,12 @@ BOOST_AUTO_TEST_CASE (player_seek_test) butler->seek (t, true); pair, DCPTime> video = butler->get_video(true, 0); BOOST_CHECK_EQUAL(video.second.get(), t.get()); - write_image(video.first->image(bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true), String::compose("build/test/player_seek_test_%1.png", i)); + write_image(video.first->image(bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, false, true), String::compose("build/test/player_seek_test_%1.png", i)); /* This 14.08 is empirically chosen (hopefully) to accept changes in rendering between the reference and a test machine (17.10 and 16.04 seem to anti-alias a little differently) but to reject gross errors e.g. missing fonts or missing text altogether. */ - check_image(String::compose("test/data/player_seek_test_%1.png", i), String::compose("build/test/player_seek_test_%1.png", i), 14.08); + check_image(TestPaths::private_data() / String::compose("player_seek_test_%1.png", i), String::compose("build/test/player_seek_test_%1.png", i), 14.08); } } @@ -246,7 +249,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test2) player->set_always_burn_open_subtitles (); player->set_play_referenced (); - shared_ptr butler (new Butler(player, AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)); + shared_ptr butler (new Butler(film, player, AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, false, true)); butler->disable_audio(); butler->seek(DCPTime::from_seconds(5), true); @@ -256,8 +259,10 @@ BOOST_AUTO_TEST_CASE (player_seek_test2) butler->seek (t, true); pair, DCPTime> video = butler->get_video(true, 0); BOOST_CHECK_EQUAL(video.second.get(), t.get()); - write_image(video.first->image(bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true), String::compose("build/test/player_seek_test2_%1.png", i)); - check_image(String::compose("test/data/player_seek_test2_%1.png", i), String::compose("build/test/player_seek_test2_%1.png", i), 14.08); + write_image( + video.first->image(bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, false, true), String::compose("build/test/player_seek_test2_%1.png", i) + ); + check_image(TestPaths::private_data() / String::compose("player_seek_test2_%1.png", i), String::compose("build/test/player_seek_test2_%1.png", i), 14.08); } } @@ -307,7 +312,7 @@ BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test) shared_ptr text = content_factory("test/data/subrip.srt").front(); film->examine_and_add_content (text); BOOST_REQUIRE (!wait_for_jobs()); - text->only_text()->set_type (TEXT_CLOSED_CAPTION); + text->only_text()->set_type (TextType::CLOSED_CAPTION); text->only_text()->set_use (true); shared_ptr player (new Player(film)); @@ -331,7 +336,7 @@ BOOST_AUTO_TEST_CASE (player_trim_crash) shared_ptr player (new Player(film)); player->set_fast (); - shared_ptr butler (new Butler(player, AudioMapping(), 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)); + shared_ptr butler (new Butler(film, player, AudioMapping(), 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, false, true)); /* Wait for the butler to fill */ dcpomatic_sleep_seconds (5); @@ -370,9 +375,9 @@ BOOST_AUTO_TEST_CASE (player_3d_test_1) film->examine_and_add_content (right); BOOST_REQUIRE (!wait_for_jobs()); - left->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT); + left->video->set_frame_type (VideoFrameType::THREE_D_LEFT); left->set_position (film, DCPTime()); - right->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT); + right->video->set_frame_type (VideoFrameType::THREE_D_RIGHT); right->set_position (film, DCPTime()); film->set_three_d (true); @@ -399,9 +404,9 @@ BOOST_AUTO_TEST_CASE (player_3d_test_2) film->examine_and_add_content (right); BOOST_REQUIRE (!wait_for_jobs()); - left->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT); + left->video->set_frame_type (VideoFrameType::THREE_D_LEFT); left->set_position (film, DCPTime()); - right->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT); + right->video->set_frame_type (VideoFrameType::THREE_D_RIGHT); right->set_position (film, DCPTime()); film->set_three_d (true); @@ -452,7 +457,6 @@ BOOST_AUTO_TEST_CASE (player_silence_at_end_crash) BOOST_REQUIRE (!wait_for_jobs()); content3->set_position (film2, DCPTime::from_seconds(1.5)); film2->set_video_frame_rate (24); - std::cout << "Here we go.\n"; film2->make_dcp (); BOOST_REQUIRE (!wait_for_jobs()); }