Fix tests after changes in c2c6fbdd8dddbb6ccba0a6ae49a13d5364122df7

[dcpomatic.git] / test / player_test.cc

diff --git a/test/player_test.cc b/test/player_test.cc
index a72e5fc170debfd1eee9035bad3f8a3cdf39ce81..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);
 }
 
 
@@ -554,6 +558,7 @@ BOOST_AUTO_TEST_CASE(multiple_sound_files_bug)
        auto C = content_factory(TestPaths::private_data() / "kook" / "3.wav").front();
 
        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 });
@@ -569,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);
@@ -596,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_"));