Supporters update.

[dcpomatic.git] / test / player_test.cc

diff --git a/test/player_test.cc b/test/player_test.cc
index 892efe5b1053d5641bd863f370c997996e63f0f8..5120c018018e02c172ef59d5b5375409acf73a90 100644 (file)
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -142,7 +142,11 @@ BOOST_AUTO_TEST_CASE (player_black_fill_test)
        check /= "black_fill_test";
        check /= film->dcp_name();
 
-       check_dcp (ref.string(), check.string());
+       /* This test is concerned with the image, so we'll ignore any
+        * differences in sound between the DCP and the reference to avoid test
+        * failures for unrelated reasons.
+        */
+       check_dcp(ref.string(), check.string(), true);
 }
 
 
@@ -545,18 +549,23 @@ BOOST_AUTO_TEST_CASE (interleaved_subtitle_are_emitted_correctly)
 
 BOOST_AUTO_TEST_CASE(multiple_sound_files_bug)
 {
+       Cleanup cl;
+
        Config::instance()->set_log_types(Config::instance()->log_types() | LogEntry::TYPE_DEBUG_PLAYER);
 
        auto A = content_factory(TestPaths::private_data() / "kook" / "1.wav").front();
        auto B = content_factory(TestPaths::private_data() / "kook" / "2.wav").front();
        auto C = content_factory(TestPaths::private_data() / "kook" / "3.wav").front();
 
-       auto film = new_test_film2("multiple_sound_files_bug", { A, B, C });
+       auto film = new_test_film2("multiple_sound_files_bug", { A, B, C }, &cl);
+       film->set_audio_channels(16);
        C->set_position(film, DCPTime(3840000));
 
        make_and_verify_dcp(film, { dcp::VerificationNote::Code::MISSING_CPL_METADATA });
 
        check_mxf_audio_file(TestPaths::private_data() / "kook" / "reference.mxf", dcp_file(film, "pcm_"));
+
+       cl.run();
 }
 
 
@@ -565,6 +574,7 @@ BOOST_AUTO_TEST_CASE(trimmed_sound_mix_bug_13)
        auto A = content_factory("test/data/sine_16_48_440_10.wav").front();
        auto B = content_factory("test/data/sine_16_44.1_440_10.wav").front();
        auto film = new_test_film2("trimmed_sound_mix_bug_13", { A, B });
+       film->set_audio_channels(16);
 
        A->set_position(film, DCPTime());
        A->audio->set_gain(-12);
@@ -592,6 +602,7 @@ BOOST_AUTO_TEST_CASE(trimmed_sound_mix_bug_13_frame_rate_change)
        A->set_video_frame_rate(film, 24);
        B->set_video_frame_rate(film, 24);
        film->set_video_frame_rate(25);
+       film->set_audio_channels(16);
 
        make_and_verify_dcp(film, { dcp::VerificationNote::Code::MISSING_CPL_METADATA });
        check_mxf_audio_file("test/data/trimmed_sound_mix_bug_13_frame_rate_change.mxf", dcp_file(film, "pcm_"));
@@ -683,7 +694,6 @@ BOOST_AUTO_TEST_CASE(three_d_in_two_d_chooses_left)
                BOOST_CHECK(!last_time || time == *last_time + DCPTime::from_frames(1, 24));
                last_time = time;
 
-               std::cout << to_string(time) << "\n";
                auto image = video->image([](AVPixelFormat) { return AV_PIX_FMT_RGB24; }, VideoRange::FULL, false);
                auto const size = image->size();
                for (int y = 0; y < size.height; ++y) {