Use some more wx_ptr.

[dcpomatic.git] / test / player_test.cc

diff --git a/test/player_test.cc b/test/player_test.cc
index 6b29cbc309fda2adeaaff586a16320dd09d59123..733883b5a5fba4b6e0b58e7127f00822bb542763 100644 (file)
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -26,12 +26,15 @@
 
 
 #include "lib/audio_buffers.h"
+#include "lib/audio_content.h"
 #include "lib/butler.h"
 #include "lib/compose.hpp"
+#include "lib/config.h"
 #include "lib/content_factory.h"
 #include "lib/cross.h"
 #include "lib/dcp_content.h"
 #include "lib/dcp_content_type.h"
+#include "lib/dcpomatic_log.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/film.h"
 #include "lib/image_content.h"
@@ -298,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);
 }
@@ -365,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);
 
@@ -384,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});
 }
@@ -538,3 +541,58 @@ BOOST_AUTO_TEST_CASE (interleaved_subtitle_are_emitted_correctly)
        while (!player.pass()) {}
 }
 
+
+BOOST_AUTO_TEST_CASE(multiple_sound_files_bug)
+{
+       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 });
+       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_"));
+}
+
+
+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 });
+
+       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));
+
+       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_"));
+}
+