projects / dcpomatic.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Cleanup: whitespace.
[dcpomatic.git] / test / player_test.cc
diff --git a/test/player_test.cc b/test/player_test.cc
index 80c7cf9eb44fc5509c7dd33a9fc1eb3493c08449..6b29cbc309fda2adeaaff586a16320dd09d59123 100644 (file)
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -83,9 +83,9 @@ BOOST_AUTO_TEST_CASE (player_silence_padding_test)
 
        accumulated = std::make_shared<AudioBuffers>(film->audio_channels(), 0);
 
-       auto player = std::make_shared<Player>(film, Image::Alignment::COMPACT);
-       player->Audio.connect (bind (&accumulate, _1, _2));
-       while (!player->pass ()) {}
+       Player player(film, Image::Alignment::COMPACT);
+       player.Audio.connect(bind(&accumulate, _1, _2));
+       while (!player.pass()) {}
        BOOST_REQUIRE (accumulated->frames() >= 48000);
        BOOST_CHECK_EQUAL (accumulated->channels(), film->audio_channels ());
 
@@ -149,10 +149,10 @@ BOOST_AUTO_TEST_CASE (player_subframe_test)
        film->set_name ("reels_test7");
        film->set_container (Ratio::from_id("185"));
        film->set_dcp_content_type (DCPContentType::from_isdcf_name("TST"));
-       auto A = content_factory("test/data/flat_red.png").front();
+       auto A = content_factory("test/data/flat_red.png")[0];
        film->examine_and_add_content (A);
        BOOST_REQUIRE (!wait_for_jobs());
-       auto B = content_factory("test/data/awkward_length.wav").front();
+       auto B = content_factory("test/data/awkward_length.wav")[0];
        film->examine_and_add_content (B);
        BOOST_REQUIRE (!wait_for_jobs());
        film->set_video_frame_rate (24);
@@ -163,12 +163,12 @@ BOOST_AUTO_TEST_CASE (player_subframe_test)
        /* Length should be rounded up from B's length to the next video frame */
        BOOST_CHECK (film->length() == DCPTime::from_frames(3 * 24 + 1, 24));
 
-       auto player = std::make_shared<Player>(film, Image::Alignment::COMPACT);
-       player->setup_pieces ();
-       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(), 1U);
-       BOOST_CHECK (player->_silent._periods.front() == DCPTimePeriod(DCPTime(289920), DCPTime::from_frames(3 * 24 + 1, 24)));
+       Player player(film, Image::Alignment::COMPACT);
+       player.setup_pieces();
+       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(), 1U);
+       BOOST_CHECK(player._silent._periods.front() == DCPTimePeriod(DCPTime(289920), DCPTime::from_frames(3 * 24 + 1, 24)));
 }
 
 
@@ -205,11 +205,11 @@ BOOST_AUTO_TEST_CASE (player_interleave_test)
        film->examine_and_add_content (s);
        BOOST_REQUIRE (!wait_for_jobs ());
 
-       auto player = std::make_shared<Player>(film, Image::Alignment::COMPACT);
-       player->Video.connect (bind (&video, _1, _2));
-       player->Audio.connect (bind (&audio, _1, _2));
+       Player player(film, Image::Alignment::COMPACT);
+       player.Video.connect(bind(&video, _1, _2));
+       player.Audio.connect(bind(&audio, _1, _2));
        video_frames = audio_frames = 0;
-       while (!player->pass ()) {
+       while (!player.pass()) {
                BOOST_CHECK (abs(video_frames - (audio_frames / 2000)) <= 8);
        }
 }
@@ -228,10 +228,10 @@ BOOST_AUTO_TEST_CASE (player_seek_test)
        BOOST_REQUIRE (!wait_for_jobs ());
        dcp->only_text()->set_use (true);
 
-       auto player = std::make_shared<Player>(film, Image::Alignment::COMPACT);
-       player->set_fast ();
-       player->set_always_burn_open_subtitles ();
-       player->set_play_referenced ();
+       Player player(film, Image::Alignment::COMPACT);
+       player.set_fast();
+       player.set_always_burn_open_subtitles();
+       player.set_play_referenced();
 
        auto butler = std::make_shared<Butler>(
                film, player, AudioMapping(), 2, bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::PADDED, true, false, Butler::Audio::DISABLED
@@ -261,10 +261,10 @@ BOOST_AUTO_TEST_CASE (player_seek_test2)
        BOOST_REQUIRE (!wait_for_jobs ());
        dcp->only_text()->set_use (true);
 
-       auto player = std::make_shared<Player>(film, Image::Alignment::COMPACT);
-       player->set_fast ();
-       player->set_always_burn_open_subtitles ();
-       player->set_play_referenced ();
+       Player player(film, Image::Alignment::COMPACT);
+       player.set_fast();
+       player.set_always_burn_open_subtitles();
+       player.set_play_referenced();
 
        auto butler = std::make_shared<Butler>
                (film, player, AudioMapping(), 2, bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::PADDED, true, false, Butler::Audio::DISABLED
@@ -289,11 +289,11 @@ BOOST_AUTO_TEST_CASE (player_seek_test2)
 BOOST_AUTO_TEST_CASE (player_trim_test)
 {
        auto film = new_test_film2 ("player_trim_test");
-       auto A = content_factory("test/data/flat_red.png").front();
+       auto A = content_factory("test/data/flat_red.png")[0];
        film->examine_and_add_content (A);
        BOOST_REQUIRE (!wait_for_jobs ());
        A->video->set_length (10 * 24);
-       auto B = content_factory("test/data/flat_red.png").front();
+       auto B = content_factory("test/data/flat_red.png")[0];
        film->examine_and_add_content (B);
        BOOST_REQUIRE (!wait_for_jobs ());
        B->video->set_length (10 * 24);
@@ -328,21 +328,21 @@ store (list<Sub>* out, PlayerText text, TextType type, optional<DCPTextTrack> tr
 BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test)
 {
        auto film = new_test_film2 ("player_ignore_video_and_audio_test");
-       auto ff = content_factory(TestPaths::private_data() / "boon_telly.mkv").front();
+       auto ff = content_factory(TestPaths::private_data() / "boon_telly.mkv")[0];
        film->examine_and_add_content (ff);
-       auto text = content_factory("test/data/subrip.srt").front();
+       auto text = content_factory("test/data/subrip.srt")[0];
        film->examine_and_add_content (text);
        BOOST_REQUIRE (!wait_for_jobs());
        text->only_text()->set_type (TextType::CLOSED_CAPTION);
        text->only_text()->set_use (true);
 
-       auto player = std::make_shared<Player>(film, Image::Alignment::COMPACT);
-       player->set_ignore_video ();
-       player->set_ignore_audio ();
+       Player player(film, Image::Alignment::COMPACT);
+       player.set_ignore_video();
+       player.set_ignore_audio();
 
        list<Sub> out;
-       player->Text.connect (bind (&store, &out, _1, _2, _3, _4));
-       while (!player->pass ()) {}
+       player.Text.connect(bind (&store, &out, _1, _2, _3, _4));
+       while (!player.pass()) {}
 
        BOOST_CHECK_EQUAL (out.size(), 6U);
 }
@@ -352,12 +352,12 @@ BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test)
 BOOST_AUTO_TEST_CASE (player_trim_crash)
 {
        auto film = new_test_film2 ("player_trim_crash");
-       auto boon = content_factory(TestPaths::private_data() / "boon_telly.mkv").front();
+       auto boon = content_factory(TestPaths::private_data() / "boon_telly.mkv")[0];
        film->examine_and_add_content (boon);
        BOOST_REQUIRE (!wait_for_jobs());
 
-       auto player = std::make_shared<Player>(film, Image::Alignment::COMPACT);
-       player->set_fast ();
+       Player player(film, Image::Alignment::COMPACT);
+       player.set_fast();
        auto butler = std::make_shared<Butler>(
                film, player, AudioMapping(), 6, bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, true, false, Butler::Audio::ENABLED
                );
@@ -380,7 +380,7 @@ BOOST_AUTO_TEST_CASE (player_trim_crash)
 BOOST_AUTO_TEST_CASE (player_silence_crash)
 {
        auto film = new_test_film2 ("player_silence_crash");
-       auto sine = content_factory("test/data/impulse_train.wav").front();
+       auto sine = content_factory("test/data/impulse_train.wav")[0];
        film->examine_and_add_content (sine);
        BOOST_REQUIRE (!wait_for_jobs());
 
@@ -394,9 +394,9 @@ BOOST_AUTO_TEST_CASE (player_silence_crash)
 BOOST_AUTO_TEST_CASE (player_3d_test_1)
 {
        auto film = new_test_film2 ("player_3d_test_1a");
-       auto left = content_factory("test/data/flat_red.png").front();
+       auto left = content_factory("test/data/flat_red.png")[0];
        film->examine_and_add_content (left);
-       auto right = content_factory("test/data/flat_blue.png").front();
+       auto right = content_factory("test/data/flat_blue.png")[0];
        film->examine_and_add_content (right);
        BOOST_REQUIRE (!wait_for_jobs());
 
@@ -419,8 +419,8 @@ BOOST_AUTO_TEST_CASE (player_3d_test_1)
 /** Test a crash when processing a 3D DCP as content in a 2D project */
 BOOST_AUTO_TEST_CASE (player_3d_test_2)
 {
-       auto left = content_factory("test/data/flat_red.png").front();
-       auto right = content_factory("test/data/flat_blue.png").front();
+       auto left = content_factory("test/data/flat_red.png")[0];
+       auto right = content_factory("test/data/flat_blue.png")[0];
        auto film = new_test_film2 ("player_3d_test_2a", {left, right});
 
        left->video->set_frame_type (VideoFrameType::THREE_D_LEFT);
@@ -444,7 +444,7 @@ BOOST_AUTO_TEST_CASE (player_3d_test_2)
 BOOST_AUTO_TEST_CASE (player_silence_at_end_crash)
 {
        /* 25fps DCP with some audio */
-       auto content1 = content_factory("test/data/flat_red.png").front();
+       auto content1 = content_factory("test/data/flat_red.png")[0];
        auto film1 = new_test_film2 ("player_silence_at_end_crash_1", {content1});
        content1->video->set_length (25);
        film1->set_video_frame_rate (25);
@@ -463,7 +463,7 @@ BOOST_AUTO_TEST_CASE (player_silence_at_end_crash)
        }
 
        BOOST_REQUIRE (video);
-       auto content3 = content_factory(*video).front();
+       auto content3 = content_factory(*video)[0];
        film2->examine_and_add_content (content3);
        BOOST_REQUIRE (!wait_for_jobs());
        content3->set_position (film2, DCPTime::from_seconds(1.5));
@@ -475,7 +475,7 @@ BOOST_AUTO_TEST_CASE (player_silence_at_end_crash)
 /** #2257 */
 BOOST_AUTO_TEST_CASE (encrypted_dcp_with_no_kdm_gives_no_butler_error)
 {
-       auto content = content_factory("test/data/flat_red.png").front();
+       auto content = content_factory("test/data/flat_red.png")[0];
        auto film = new_test_film2 ("encrypted_dcp_with_no_kdm_gives_no_butler_error", { content });
        int constexpr length = 24 * 25;
        content->video->set_length(length);
@@ -489,7 +489,7 @@ BOOST_AUTO_TEST_CASE (encrypted_dcp_with_no_kdm_gives_no_butler_error)
        auto content2 = std::make_shared<DCPContent>(film->dir(film->dcp_name()));
        auto film2 = new_test_film2 ("encrypted_dcp_with_no_kdm_gives_no_butler_error2", { content2 });
 
-       auto player = std::make_shared<Player>(film2, Image::Alignment::COMPACT);
+       Player player(film, Image::Alignment::COMPACT);
        Butler butler(film2, player, AudioMapping(), 2, bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::PADDED, true, false, Butler::Audio::ENABLED);
 
        float buffer[2000 * 6];
@@ -520,21 +520,21 @@ BOOST_AUTO_TEST_CASE (interleaved_subtitle_are_emitted_correctly)
        subs_file[0].close();
        subs_file[1].close();
 
-       auto subs1 = content_factory(paths[0]).front();
-       auto subs2 = content_factory(paths[1]).front();
+       auto subs1 = content_factory(paths[0])[0];
+       auto subs2 = content_factory(paths[1])[0];
        auto film = new_test_film2("interleaved_subtitle_are_emitted_correctly", { subs1, subs2 });
        film->set_sequence(false);
        subs1->set_position(film, DCPTime());
        subs2->set_position(film, DCPTime());
 
-       auto player = std::make_shared<Player>(film, Image::Alignment::COMPACT);
+       Player player(film, Image::Alignment::COMPACT);
        dcp::Time last;
-       player->Text.connect([&last](PlayerText text, TextType, optional<DCPTextTrack>, dcpomatic::DCPTimePeriod) {
+       player.Text.connect([&last](PlayerText text, TextType, optional<DCPTextTrack>, dcpomatic::DCPTimePeriod) {
                for (auto sub: text.string) {
                        BOOST_CHECK(sub.in() >= last);
                        last = sub.in();
                }
        });
-       while (!player->pass()) {}
+       while (!player.pass()) {}
 }
 
Development branch of dcpomatic