X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fplayer_test.cc;h=5120c018018e02c172ef59d5b5375409acf73a90;hb=HEAD;hp=d0460d88da1d6a455c410a6ec0a46e79dce3585d;hpb=5334f1c120ed248f22a5751d47555cf94bf9b4a9;p=dcpomatic.git diff --git a/test/player_test.cc b/test/player_test.cc index d0460d88d..a13b50352 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -30,6 +30,7 @@ #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" @@ -38,6 +39,7 @@ #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" @@ -141,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); } @@ -301,7 +307,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 +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); @@ -387,7 +393,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}); } @@ -544,18 +550,23 @@ BOOST_AUTO_TEST_CASE (interleaved_subtitle_are_emitted_correctly) 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 }); + 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(); } @@ -564,12 +575,13 @@ 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(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_")); @@ -586,13 +598,134 @@ BOOST_AUTO_TEST_CASE(trimmed_sound_mix_bug_13_frame_rate_change) 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)); - A->set_video_frame_rate(24); - B->set_video_frame_rate(24); + 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(); +} +