X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fplayer_test.cc;h=80c7cf9eb44fc5509c7dd33a9fc1eb3493c08449;hb=59209af1e2d73334ff7dfe6c7da465293dc24c0b;hp=2caa34753e4e8fcca0e8d7e6e3618bad1592311f;hpb=3799e91d126d243d41c44dcb0ca1bfa66b53a57e;p=dcpomatic.git diff --git a/test/player_test.cc b/test/player_test.cc index 2caa34753..80c7cf9eb 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -210,7 +210,7 @@ BOOST_AUTO_TEST_CASE (player_interleave_test) player->Audio.connect (bind (&audio, _1, _2)); video_frames = audio_frames = 0; while (!player->pass ()) { - BOOST_CHECK (abs(video_frames - (audio_frames / 2000)) < 8); + BOOST_CHECK (abs(video_frames - (audio_frames / 2000)) <= 8); } } @@ -233,15 +233,16 @@ BOOST_AUTO_TEST_CASE (player_seek_test) player->set_always_burn_open_subtitles (); player->set_play_referenced (); - auto butler = std::make_shared(film, player, AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, true, false); - butler->disable_audio(); + 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 + ); for (int i = 0; i < 10; ++i) { auto t = DCPTime::from_frames (i, 24); butler->seek (t, true); - auto video = butler->get_video(true, 0); + auto video = butler->get_video(Butler::Behaviour::BLOCKING, 0); BOOST_CHECK_EQUAL(video.second.get(), t.get()); - write_image(video.first->image(bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, true), String::compose("build/test/player_seek_test_%1.png", i)); + write_image(video.first->image(bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, true), String::compose("build/test/player_seek_test_%1.png", i)); /* This 14.08 is empirically chosen (hopefully) to accept changes in rendering between the reference and a test machine (17.10 and 16.04 seem to anti-alias a little differently) but to reject gross errors e.g. missing fonts or missing text altogether. @@ -265,18 +266,19 @@ BOOST_AUTO_TEST_CASE (player_seek_test2) player->set_always_burn_open_subtitles (); player->set_play_referenced (); - auto butler = std::make_shared(film, player, AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, true, false); - butler->disable_audio(); + 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 + ); butler->seek(DCPTime::from_seconds(5), true); for (int i = 0; i < 10; ++i) { auto t = DCPTime::from_seconds(5) + DCPTime::from_frames (i, 24); butler->seek (t, true); - auto video = butler->get_video(true, 0); + auto video = butler->get_video(Butler::Behaviour::BLOCKING, 0); BOOST_CHECK_EQUAL(video.second.get(), t.get()); write_image( - video.first->image(bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, true), String::compose("build/test/player_seek_test2_%1.png", i) + video.first->image(bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, true), String::compose("build/test/player_seek_test2_%1.png", i) ); check_image(TestPaths::private_data() / String::compose("player_seek_test2_%1.png", i), String::compose("build/test/player_seek_test2_%1.png", i), 14.08); } @@ -356,7 +358,9 @@ BOOST_AUTO_TEST_CASE (player_trim_crash) auto player = std::make_shared(film, Image::Alignment::COMPACT); player->set_fast (); - auto butler = std::make_shared(film, player, AudioMapping(), 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, true, false); + 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 + ); /* Wait for the butler to fill */ dcpomatic_sleep_seconds (5); @@ -466,3 +470,71 @@ BOOST_AUTO_TEST_CASE (player_silence_at_end_crash) film2->set_video_frame_rate (24); make_and_verify_dcp (film2); } + + +/** #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 film = new_test_film2 ("encrypted_dcp_with_no_kdm_gives_no_butler_error", { content }); + int constexpr length = 24 * 25; + content->video->set_length(length); + film->set_encrypted (true); + make_and_verify_dcp ( + film, + { + dcp::VerificationNote::Code::MISSING_CPL_METADATA, + }); + + 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); + 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]; + for (int i = 0; i < length; ++i) { + butler.get_video(Butler::Behaviour::BLOCKING, 0); + butler.get_audio(Butler::Behaviour::BLOCKING, buffer, 2000); + } + + BOOST_CHECK_NO_THROW(butler.rethrow()); +} + + +BOOST_AUTO_TEST_CASE (interleaved_subtitle_are_emitted_correctly) +{ + boost::filesystem::path paths[2] = { + "build/test/interleaved_subtitle_are_emitted_correctly1.srt", + "build/test/interleaved_subtitle_are_emitted_correctly2.srt" + }; + + dcp::File subs_file[2] = { dcp::File(paths[0], "w"), dcp::File(paths[1], "w") }; + + fprintf(subs_file[0].get(), "1\n00:00:01,000 -> 00:00:02,000\nSub 1/1\n\n"); + fprintf(subs_file[0].get(), "2\n00:00:05,000 -> 00:00:06,000\nSub 1/2\n\n"); + + fprintf(subs_file[1].get(), "1\n00:00:00,500 -> 00:00:01,500\nSub 2/1\n\n"); + fprintf(subs_file[1].get(), "2\n00:00:02,000 -> 00:00:03,000\nSub 2/2\n\n"); + + subs_file[0].close(); + subs_file[1].close(); + + auto subs1 = content_factory(paths[0]).front(); + auto subs2 = content_factory(paths[1]).front(); + 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); + dcp::Time last; + 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()) {} +} +