X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fplayer_test.cc;h=5120c018018e02c172ef59d5b5375409acf73a90;hb=HEAD;hp=80c7cf9eb44fc5509c7dd33a9fc1eb3493c08449;hpb=c8a036eb727ceddc64a0304d781c916eb952c001;p=dcpomatic.git diff --git a/test/player_test.cc b/test/player_test.cc index 80c7cf9eb..a13b50352 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -26,15 +26,20 @@ #include "lib/audio_buffers.h" +#include "lib/audio_content.h" #include "lib/butler.h" #include "lib/compose.hpp" +#include "lib/config.h" +#include "lib/constants.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" +#include "lib/image_png.h" #include "lib/player.h" #include "lib/ratio.h" #include "lib/string_text_file_content.h" @@ -83,9 +88,9 @@ BOOST_AUTO_TEST_CASE (player_silence_padding_test) accumulated = std::make_shared(film->audio_channels(), 0); - auto player = std::make_shared(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 ()); @@ -138,7 +143,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); } @@ -149,10 +158,10 @@ BOOST_AUTO_TEST_CASE (player_subframe_test) film->set_name ("reels_test7"); film->set_container (Ratio::from_id("185")); film->set_dcp_content_type (DCPContentType::from_isdcf_name("TST")); - auto A = content_factory("test/data/flat_red.png").front(); + auto A = content_factory("test/data/flat_red.png")[0]; film->examine_and_add_content (A); BOOST_REQUIRE (!wait_for_jobs()); - auto B = content_factory("test/data/awkward_length.wav").front(); + auto B = content_factory("test/data/awkward_length.wav")[0]; film->examine_and_add_content (B); BOOST_REQUIRE (!wait_for_jobs()); film->set_video_frame_rate (24); @@ -163,12 +172,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(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 +214,11 @@ BOOST_AUTO_TEST_CASE (player_interleave_test) film->examine_and_add_content (s); BOOST_REQUIRE (!wait_for_jobs ()); - auto player = std::make_shared(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 +237,10 @@ BOOST_AUTO_TEST_CASE (player_seek_test) BOOST_REQUIRE (!wait_for_jobs ()); dcp->only_text()->set_use (true); - auto player = std::make_shared(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( film, player, AudioMapping(), 2, bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::PADDED, true, false, Butler::Audio::DISABLED @@ -261,10 +270,10 @@ BOOST_AUTO_TEST_CASE (player_seek_test2) BOOST_REQUIRE (!wait_for_jobs ()); dcp->only_text()->set_use (true); - auto player = std::make_shared(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 (film, player, AudioMapping(), 2, bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::PADDED, true, false, Butler::Audio::DISABLED @@ -289,16 +298,16 @@ BOOST_AUTO_TEST_CASE (player_seek_test2) BOOST_AUTO_TEST_CASE (player_trim_test) { auto film = new_test_film2 ("player_trim_test"); - auto A = content_factory("test/data/flat_red.png").front(); + auto A = content_factory("test/data/flat_red.png")[0]; film->examine_and_add_content (A); BOOST_REQUIRE (!wait_for_jobs ()); A->video->set_length (10 * 24); - auto B = content_factory("test/data/flat_red.png").front(); + auto B = content_factory("test/data/flat_red.png")[0]; film->examine_and_add_content (B); 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); } @@ -328,21 +337,21 @@ store (list* out, PlayerText text, TextType type, optional tr BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test) { auto film = new_test_film2 ("player_ignore_video_and_audio_test"); - auto ff = content_factory(TestPaths::private_data() / "boon_telly.mkv").front(); + auto ff = content_factory(TestPaths::private_data() / "boon_telly.mkv")[0]; film->examine_and_add_content (ff); - auto text = content_factory("test/data/subrip.srt").front(); + auto text = content_factory("test/data/subrip.srt")[0]; film->examine_and_add_content (text); BOOST_REQUIRE (!wait_for_jobs()); text->only_text()->set_type (TextType::CLOSED_CAPTION); text->only_text()->set_use (true); - auto player = std::make_shared(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 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); } @@ -352,12 +361,12 @@ BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test) BOOST_AUTO_TEST_CASE (player_trim_crash) { auto film = new_test_film2 ("player_trim_crash"); - auto boon = content_factory(TestPaths::private_data() / "boon_telly.mkv").front(); + auto boon = content_factory(TestPaths::private_data() / "boon_telly.mkv")[0]; film->examine_and_add_content (boon); BOOST_REQUIRE (!wait_for_jobs()); - auto player = std::make_shared(film, Image::Alignment::COMPACT); - player->set_fast (); + Player player(film, Image::Alignment::COMPACT); + player.set_fast(); auto butler = std::make_shared( film, player, AudioMapping(), 6, bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, true, false, Butler::Audio::ENABLED ); @@ -365,7 +374,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); @@ -380,11 +389,11 @@ BOOST_AUTO_TEST_CASE (player_trim_crash) BOOST_AUTO_TEST_CASE (player_silence_crash) { auto film = new_test_film2 ("player_silence_crash"); - auto sine = content_factory("test/data/impulse_train.wav").front(); + auto sine = content_factory("test/data/impulse_train.wav")[0]; 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}); } @@ -394,9 +403,9 @@ BOOST_AUTO_TEST_CASE (player_silence_crash) BOOST_AUTO_TEST_CASE (player_3d_test_1) { auto film = new_test_film2 ("player_3d_test_1a"); - auto left = content_factory("test/data/flat_red.png").front(); + auto left = content_factory("test/data/flat_red.png")[0]; film->examine_and_add_content (left); - auto right = content_factory("test/data/flat_blue.png").front(); + auto right = content_factory("test/data/flat_blue.png")[0]; film->examine_and_add_content (right); BOOST_REQUIRE (!wait_for_jobs()); @@ -419,8 +428,8 @@ BOOST_AUTO_TEST_CASE (player_3d_test_1) /** Test a crash when processing a 3D DCP as content in a 2D project */ BOOST_AUTO_TEST_CASE (player_3d_test_2) { - auto left = content_factory("test/data/flat_red.png").front(); - auto right = content_factory("test/data/flat_blue.png").front(); + auto left = content_factory("test/data/flat_red.png")[0]; + auto right = content_factory("test/data/flat_blue.png")[0]; auto film = new_test_film2 ("player_3d_test_2a", {left, right}); left->video->set_frame_type (VideoFrameType::THREE_D_LEFT); @@ -444,7 +453,7 @@ BOOST_AUTO_TEST_CASE (player_3d_test_2) BOOST_AUTO_TEST_CASE (player_silence_at_end_crash) { /* 25fps DCP with some audio */ - auto content1 = content_factory("test/data/flat_red.png").front(); + auto content1 = content_factory("test/data/flat_red.png")[0]; auto film1 = new_test_film2 ("player_silence_at_end_crash_1", {content1}); content1->video->set_length (25); film1->set_video_frame_rate (25); @@ -463,7 +472,7 @@ BOOST_AUTO_TEST_CASE (player_silence_at_end_crash) } BOOST_REQUIRE (video); - auto content3 = content_factory(*video).front(); + auto content3 = content_factory(*video)[0]; film2->examine_and_add_content (content3); BOOST_REQUIRE (!wait_for_jobs()); content3->set_position (film2, DCPTime::from_seconds(1.5)); @@ -475,7 +484,7 @@ BOOST_AUTO_TEST_CASE (player_silence_at_end_crash) /** #2257 */ BOOST_AUTO_TEST_CASE (encrypted_dcp_with_no_kdm_gives_no_butler_error) { - auto content = content_factory("test/data/flat_red.png").front(); + auto content = content_factory("test/data/flat_red.png")[0]; auto film = new_test_film2 ("encrypted_dcp_with_no_kdm_gives_no_butler_error", { content }); int constexpr length = 24 * 25; content->video->set_length(length); @@ -489,7 +498,7 @@ BOOST_AUTO_TEST_CASE (encrypted_dcp_with_no_kdm_gives_no_butler_error) auto content2 = std::make_shared(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(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]; @@ -520,21 +529,203 @@ BOOST_AUTO_TEST_CASE (interleaved_subtitle_are_emitted_correctly) subs_file[0].close(); subs_file[1].close(); - auto subs1 = content_factory(paths[0]).front(); - auto subs2 = content_factory(paths[1]).front(); + auto subs1 = content_factory(paths[0])[0]; + auto subs2 = content_factory(paths[1])[0]; auto film = new_test_film2("interleaved_subtitle_are_emitted_correctly", { subs1, subs2 }); film->set_sequence(false); subs1->set_position(film, DCPTime()); subs2->set_position(film, DCPTime()); - auto player = std::make_shared(film, Image::Alignment::COMPACT); + Player player(film, Image::Alignment::COMPACT); dcp::Time last; - player->Text.connect([&last](PlayerText text, TextType, optional, dcpomatic::DCPTimePeriod) { + player.Text.connect([&last](PlayerText text, TextType, optional, dcpomatic::DCPTimePeriod) { for (auto sub: text.string) { BOOST_CHECK(sub.in() >= last); last = sub.in(); } }); + while (!player.pass()) {} +} + + +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 }, &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(); +} + + +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); + 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); + 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_")); +} + + +BOOST_AUTO_TEST_CASE(two_d_in_three_d_duplicates) +{ + auto A = content_factory("test/data/flat_red.png").front(); + auto B = content_factory("test/data/flat_green.png").front(); + auto film = new_test_film2("two_d_in_three_d_duplicates", { A, B }); + + film->set_three_d(true); + B->video->set_frame_type(VideoFrameType::THREE_D_LEFT_RIGHT); + B->set_position(film, DCPTime::from_seconds(10)); + B->video->set_custom_size(dcp::Size(1998, 1080)); + + auto player = std::make_shared(film, film->playlist()); + + std::vector red_line(1998 * 3); + for (int i = 0; i < 1998; ++i) { + red_line[i * 3] = 255; + }; + + std::vector green_line(1998 * 3); + for (int i = 0; i < 1998; ++i) { + green_line[i * 3 + 1] = 255; + }; + + Eyes last_eyes = Eyes::RIGHT; + optional last_time; + player->Video.connect([&last_eyes, &last_time, &red_line, &green_line](shared_ptr video, dcpomatic::DCPTime time) { + BOOST_CHECK(last_eyes != video->eyes()); + last_eyes = video->eyes(); + if (video->eyes() == Eyes::LEFT) { + BOOST_CHECK(!last_time || time == *last_time + DCPTime::from_frames(1, 24)); + } else { + BOOST_CHECK(time == *last_time); + } + last_time = time; + + 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) { + uint8_t* line = image->data()[0] + y * image->stride()[0]; + if (time < DCPTime::from_seconds(10)) { + BOOST_REQUIRE_EQUAL(memcmp(line, red_line.data(), 1998 * 3), 0); + } else { + BOOST_REQUIRE_EQUAL(memcmp(line, green_line.data(), 1998 * 3), 0); + } + } + }); + + BOOST_CHECK(film->length() == DCPTime::from_seconds(20)); while (!player->pass()) {} } + +BOOST_AUTO_TEST_CASE(three_d_in_two_d_chooses_left) +{ + auto left = content_factory("test/data/flat_red.png").front(); + auto right = content_factory("test/data/flat_green.png").front(); + auto mono = content_factory("test/data/flat_blue.png").front(); + + auto film = new_test_film2("three_d_in_two_d_chooses_left", { left, right, mono }); + + left->video->set_frame_type(VideoFrameType::THREE_D_LEFT); + left->set_position(film, dcpomatic::DCPTime()); + right->video->set_frame_type(VideoFrameType::THREE_D_RIGHT); + right->set_position(film, dcpomatic::DCPTime()); + + mono->set_position(film, dcpomatic::DCPTime::from_seconds(10)); + + auto player = std::make_shared(film, film->playlist()); + + std::vector red_line(1998 * 3); + for (int i = 0; i < 1998; ++i) { + red_line[i * 3] = 255; + }; + + std::vector blue_line(1998 * 3); + for (int i = 0; i < 1998; ++i) { + blue_line[i * 3 + 2] = 255; + }; + + optional last_time; + player->Video.connect([&last_time, &red_line, &blue_line](shared_ptr video, dcpomatic::DCPTime time) { + BOOST_CHECK(video->eyes() == Eyes::BOTH); + BOOST_CHECK(!last_time || time == *last_time + DCPTime::from_frames(1, 24)); + last_time = time; + + 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) { + uint8_t* line = image->data()[0] + y * image->stride()[0]; + if (time < DCPTime::from_seconds(10)) { + BOOST_REQUIRE_EQUAL(memcmp(line, red_line.data(), 1998 * 3), 0); + } else { + BOOST_REQUIRE_EQUAL(memcmp(line, blue_line.data(), 1998 * 3), 0); + } + } + }); + + BOOST_CHECK(film->length() == DCPTime::from_seconds(20)); + while (!player->pass()) {} +} + + +BOOST_AUTO_TEST_CASE(unmapped_audio_does_not_raise_buffer_error) +{ + auto content = content_factory(TestPaths::private_data() / "arrietty_JP-EN.mkv")[0]; + auto film = new_test_film2("unmapped_audio_does_not_raise_buffer_error", { content }); + + content->audio->set_mapping(AudioMapping(6 * 2, MAX_DCP_AUDIO_CHANNELS)); + + Player player(film, Image::Alignment::COMPACT); + Butler butler(film, player, AudioMapping(), 2, bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::PADDED, true, false, Butler::Audio::ENABLED); + + /* Wait for the butler thread to run for a while; in the case under test it will throw an exception because + * the video buffers are filled but no audio comes. + */ + dcpomatic_sleep_seconds(10); + butler.rethrow(); +} +