projects / dcpomatic.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Supporters update.
[dcpomatic.git] / test / player_test.cc
diff --git a/test/player_test.cc b/test/player_test.cc
index 19336ac4f4d27ad0483dbe19850d34cec923375b..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"
@@ -83,9 +86,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 ());
 
@@ -163,12 +166,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 +208,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 +231,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 +264,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
@@ -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);
 }
@@ -336,13 +339,13 @@ BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test)
        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);
 }
@@ -356,8 +359,8 @@ BOOST_AUTO_TEST_CASE (player_trim_crash)
        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
                );
@@ -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});
 }
@@ -489,7 +492,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];
@@ -527,14 +530,69 @@ BOOST_AUTO_TEST_CASE (interleaved_subtitle_are_emitted_correctly)
        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()) {}
+}
+
+
+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_"));
 }
 
2.0 development branch of dcpomatic