Noisy change to get film into AudioContent::modify_trim_start().

[dcpomatic.git] / test / player_test.cc

diff --git a/test/player_test.cc b/test/player_test.cc
index e0f0d1ff0a1c6ee7e00a68531975ca5ebf7da65d..733883b5a5fba4b6e0b58e7127f00822bb542763 100644 (file)
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -301,7 +301,7 @@ BOOST_AUTO_TEST_CASE (player_trim_test)
        BOOST_REQUIRE (!wait_for_jobs ());
        B->video->set_length (10 * 24);
        B->set_position (film, DCPTime::from_seconds(10));
-       B->set_trim_start (ContentTime::from_seconds (2));
+       B->set_trim_start(film, ContentTime::from_seconds(2));
 
        make_and_verify_dcp (film);
 }
@@ -368,7 +368,7 @@ BOOST_AUTO_TEST_CASE (player_trim_crash)
        /* Wait for the butler to fill */
        dcpomatic_sleep_seconds (5);
 
-       boon->set_trim_start (ContentTime::from_seconds(5));
+       boon->set_trim_start(film, ContentTime::from_seconds(5));
 
        butler->seek (DCPTime(), true);
 
@@ -387,7 +387,7 @@ BOOST_AUTO_TEST_CASE (player_silence_crash)
        film->examine_and_add_content (sine);
        BOOST_REQUIRE (!wait_for_jobs());
 
-       sine->set_video_frame_rate (23.976);
+       sine->set_video_frame_rate(film, 23.976);
        film->write_metadata ();
        make_and_verify_dcp (film, {dcp::VerificationNote::Code::MISSING_CPL_METADATA});
 }
@@ -569,9 +569,30 @@ BOOST_AUTO_TEST_CASE(trimmed_sound_mix_bug_13)
        A->audio->set_gain(-12);
        B->set_position(film, DCPTime());
        B->audio->set_gain(-12);
-       B->set_trim_start(ContentTime(13));
+       B->set_trim_start(film, ContentTime(13));
 
        make_and_verify_dcp(film, { dcp::VerificationNote::Code::MISSING_CPL_METADATA });
        check_mxf_audio_file("test/data/trimmed_sound_mix_bug_13.mxf", dcp_file(film, "pcm_"));
 }
 
+
+BOOST_AUTO_TEST_CASE(trimmed_sound_mix_bug_13_frame_rate_change)
+{
+       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_frame_rate_change", { A, B });
+
+       A->set_position(film, DCPTime());
+       A->audio->set_gain(-12);
+       B->set_position(film, DCPTime());
+       B->audio->set_gain(-12);
+       B->set_trim_start(film, ContentTime(13));
+
+       A->set_video_frame_rate(film, 24);
+       B->set_video_frame_rate(film, 24);
+       film->set_video_frame_rate(25);
+
+       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_"));
+}
+