Make sure we use limited ("video") range data when exporting.

[dcpomatic.git] / test / player_test.cc

diff --git a/test/player_test.cc b/test/player_test.cc
index 2e979eb44f5ea0b067972d5b47237ff7810428fe..f44806d68e673ed9f501897d0e84761162039b99 100644 (file)
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -49,6 +49,9 @@ using std::pair;
 using boost::shared_ptr;
 using boost::bind;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using namespace dcpomatic;
 
 static shared_ptr<AudioBuffers> accumulated;
@@ -151,9 +154,9 @@ BOOST_AUTO_TEST_CASE (player_subframe_test)
 
        shared_ptr<Player> player (new Player(film));
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_black._periods.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_black._periods.size(), 1U);
        BOOST_CHECK (player->_black._periods.front() == DCPTimePeriod(DCPTime::from_frames(3 * 24, 24), DCPTime::from_frames(3 * 24 + 1, 24)));
-       BOOST_REQUIRE_EQUAL (player->_silent._periods.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_silent._periods.size(), 1U);
        BOOST_CHECK (player->_silent._periods.front() == DCPTimePeriod(DCPTime(289920), DCPTime::from_frames(3 * 24 + 1, 24)));
 }
 
@@ -205,7 +208,7 @@ BOOST_AUTO_TEST_CASE (player_interleave_test)
 BOOST_AUTO_TEST_CASE (player_seek_test)
 {
        shared_ptr<Film> film (new Film (optional<boost::filesystem::path>()));
-       shared_ptr<DCPContent> dcp (new DCPContent(TestPaths::private_data / "awkward_subs"));
+       shared_ptr<DCPContent> dcp (new DCPContent(TestPaths::private_data() / "awkward_subs"));
        film->examine_and_add_content (dcp, true);
        BOOST_REQUIRE (!wait_for_jobs ());
        dcp->only_text()->set_use (true);
@@ -215,7 +218,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test)
        player->set_always_burn_open_subtitles ();
        player->set_play_referenced ();
 
-       shared_ptr<Butler> butler (new Butler (player, AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
+       shared_ptr<Butler> butler (new Butler (player, AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_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<shared_ptr<PlayerVideo>, 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), "RGB");
-               /* This 0.055 is empirically chosen (hopefully) to accept changes in rendering between the reference and a test machine
+               write_image(video.first->image(bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_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), 0.055);
+               check_image(String::compose("test/data/player_seek_test_%1.png", i), String::compose("build/test/player_seek_test_%1.png", i), 14.08);
        }
 }
 
@@ -236,7 +239,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test)
 BOOST_AUTO_TEST_CASE (player_seek_test2)
 {
        shared_ptr<Film> film (new Film (optional<boost::filesystem::path>()));
-       shared_ptr<DCPContent> dcp (new DCPContent(TestPaths::private_data / "awkward_subs2"));
+       shared_ptr<DCPContent> dcp (new DCPContent(TestPaths::private_data() / "awkward_subs2"));
        film->examine_and_add_content (dcp, true);
        BOOST_REQUIRE (!wait_for_jobs ());
        dcp->only_text()->set_use (true);
@@ -246,7 +249,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test2)
        player->set_always_burn_open_subtitles ();
        player->set_play_referenced ();
 
-       shared_ptr<Butler> butler (new Butler(player, AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
+       shared_ptr<Butler> butler (new Butler(player, AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_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<shared_ptr<PlayerVideo>, 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), "RGB");
-               check_image(String::compose("test/data/player_seek_test2_%1.png", i), String::compose("build/test/player_seek_test2_%1.png", i), 0.055);
+               write_image(
+                       video.first->image(bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_FULL, 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);
        }
 }
 
@@ -302,7 +307,7 @@ store (list<Sub>* out, PlayerText text, TextType type, optional<DCPTextTrack> tr
 BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test)
 {
        shared_ptr<Film> film = new_test_film2 ("player_ignore_video_and_audio_test");
-       shared_ptr<Content> ff = content_factory(TestPaths::private_data / "boon_telly.mkv").front();
+       shared_ptr<Content> ff = content_factory(TestPaths::private_data() / "boon_telly.mkv").front();
        film->examine_and_add_content (ff);
        shared_ptr<Content> text = content_factory("test/data/subrip.srt").front();
        film->examine_and_add_content (text);
@@ -318,20 +323,20 @@ BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test)
        player->Text.connect (bind (&store, &out, _1, _2, _3, _4));
        while (!player->pass ()) {}
 
-       BOOST_CHECK_EQUAL (out.size(), 6);
+       BOOST_CHECK_EQUAL (out.size(), 6U);
 }
 
 /** Trigger a crash due to the assertion failure in Player::emit_audio */
 BOOST_AUTO_TEST_CASE (player_trim_crash)
 {
        shared_ptr<Film> film = new_test_film2 ("player_trim_crash");
-       shared_ptr<Content> boon = content_factory(TestPaths::private_data / "boon_telly.mkv").front();
+       shared_ptr<Content> boon = content_factory(TestPaths::private_data() / "boon_telly.mkv").front();
        film->examine_and_add_content (boon);
        BOOST_REQUIRE (!wait_for_jobs());
 
        shared_ptr<Player> player (new Player(film));
        player->set_fast ();
-       shared_ptr<Butler> butler (new Butler(player, AudioMapping(), 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
+       shared_ptr<Butler> butler (new Butler(player, AudioMapping(), 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_FULL, false, true));
 
        /* Wait for the butler to fill */
        dcpomatic_sleep_seconds (5);
@@ -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());
 }