X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fplayer_test.cc;h=19336ac4f4d27ad0483dbe19850d34cec923375b;hb=b1e22dff981fb86ae04b12bb5a064e61030793a8;hp=e78e0ee355329035c5124beec2ff5df3cbb2cbac;hpb=8987f133295e352c44e05ef338eacc801c61a629;p=dcpomatic.git diff --git a/test/player_test.cc b/test/player_test.cc index e78e0ee35..19336ac4f 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -149,10 +149,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); @@ -289,11 +289,11 @@ 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); @@ -328,9 +328,9 @@ 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); @@ -352,7 +352,7 @@ 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()); @@ -380,7 +380,7 @@ 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()); @@ -394,9 +394,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 +419,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 +444,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 +463,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 +475,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); @@ -501,3 +501,40 @@ BOOST_AUTO_TEST_CASE (encrypted_dcp_with_no_kdm_gives_no_butler_error) 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])[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); + 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()) {} +} +