X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fplayer_test.cc;h=2e979eb44f5ea0b067972d5b47237ff7810428fe;hb=4edc14c8b1410e24f68b510cc14409b96c0338a3;hp=af40002deb06191af6cae40311395f68498de9a3;hpb=335ef709439cd3678f6813a3fb880110e4c9cb26;p=dcpomatic.git diff --git a/test/player_test.cc b/test/player_test.cc index af40002de..2e979eb44 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Carl Hetherington + Copyright (C) 2014-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -40,6 +40,7 @@ #include "lib/cross.h" #include "test.h" #include +#include #include using std::cout; @@ -73,7 +74,7 @@ BOOST_AUTO_TEST_CASE (player_silence_padding_test) accumulated.reset (new AudioBuffers (film->audio_channels(), 0)); - shared_ptr player (new Player (film, film->playlist ())); + shared_ptr player (new Player(film)); player->Audio.connect (bind (&accumulate, _1, _2)); while (!player->pass ()) {} BOOST_REQUIRE (accumulated->frames() >= 48000); @@ -102,12 +103,12 @@ BOOST_AUTO_TEST_CASE (player_black_fill_test) film->examine_and_add_content (contentB); BOOST_REQUIRE (!wait_for_jobs()); - contentA->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); contentA->video->set_length (3); contentA->set_position (film, DCPTime::from_frames(2, film->video_frame_rate())); - contentB->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); + contentA->video->set_custom_ratio (1.85); contentB->video->set_length (1); contentB->set_position (film, DCPTime::from_frames(7, film->video_frame_rate())); + contentB->video->set_custom_ratio (1.85); film->make_dcp (); @@ -148,7 +149,7 @@ 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)); - shared_ptr player (new Player (film, film->playlist ())); + shared_ptr player (new Player(film)); player->setup_pieces (); BOOST_REQUIRE_EQUAL (player->_black._periods.size(), 1); BOOST_CHECK (player->_black._periods.front() == DCPTimePeriod(DCPTime::from_frames(3 * 24, 24), DCPTime::from_frames(3 * 24 + 1, 24))); @@ -187,7 +188,7 @@ BOOST_AUTO_TEST_CASE (player_interleave_test) film->examine_and_add_content (s); BOOST_REQUIRE (!wait_for_jobs ()); - shared_ptr player (new Player(film, film->playlist())); + shared_ptr player (new Player(film)); player->Video.connect (bind (&video, _1, _2)); player->Audio.connect (bind (&audio, _1, _2)); video_frames = audio_frames = 0; @@ -204,12 +205,12 @@ BOOST_AUTO_TEST_CASE (player_interleave_test) BOOST_AUTO_TEST_CASE (player_seek_test) { shared_ptr film (new Film (optional())); - shared_ptr dcp (new DCPContent(private_data / "awkward_subs")); + shared_ptr dcp (new DCPContent(TestPaths::private_data / "awkward_subs")); film->examine_and_add_content (dcp, true); BOOST_REQUIRE (!wait_for_jobs ()); dcp->only_text()->set_use (true); - shared_ptr player (new Player (film, film->playlist())); + shared_ptr player (new Player(film)); player->set_fast (); player->set_always_burn_open_subtitles (); player->set_play_referenced (); @@ -235,12 +236,12 @@ BOOST_AUTO_TEST_CASE (player_seek_test) BOOST_AUTO_TEST_CASE (player_seek_test2) { shared_ptr film (new Film (optional())); - shared_ptr dcp (new DCPContent(private_data / "awkward_subs2")); + shared_ptr dcp (new DCPContent(TestPaths::private_data / "awkward_subs2")); film->examine_and_add_content (dcp, true); BOOST_REQUIRE (!wait_for_jobs ()); dcp->only_text()->set_use (true); - shared_ptr player (new Player (film, film->playlist())); + shared_ptr player (new Player(film)); player->set_fast (); player->set_always_burn_open_subtitles (); player->set_play_referenced (); @@ -301,7 +302,7 @@ store (list* out, PlayerText text, TextType type, optional tr BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test) { shared_ptr film = new_test_film2 ("player_ignore_video_and_audio_test"); - shared_ptr ff = content_factory(private_data / "boon_telly.mkv").front(); + shared_ptr ff = content_factory(TestPaths::private_data / "boon_telly.mkv").front(); film->examine_and_add_content (ff); shared_ptr text = content_factory("test/data/subrip.srt").front(); film->examine_and_add_content (text); @@ -309,7 +310,7 @@ BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test) text->only_text()->set_type (TEXT_CLOSED_CAPTION); text->only_text()->set_use (true); - shared_ptr player (new Player(film, film->playlist())); + shared_ptr player (new Player(film)); player->set_ignore_video (); player->set_ignore_audio (); @@ -324,23 +325,134 @@ BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test) BOOST_AUTO_TEST_CASE (player_trim_crash) { shared_ptr film = new_test_film2 ("player_trim_crash"); - shared_ptr boon = content_factory(private_data / "boon_telly.mkv").front(); + shared_ptr boon = content_factory(TestPaths::private_data / "boon_telly.mkv").front(); film->examine_and_add_content (boon); BOOST_REQUIRE (!wait_for_jobs()); - shared_ptr player (new Player(film, film->playlist())); + shared_ptr player (new Player(film)); player->set_fast (); shared_ptr butler (new Butler(player, AudioMapping(), 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)); /* Wait for the butler to fill */ - dcpomatic_sleep (5); + dcpomatic_sleep_seconds (5); boon->set_trim_start (ContentTime::from_seconds(5)); butler->seek (DCPTime(), true); /* Wait for the butler to refill */ - dcpomatic_sleep (5); + dcpomatic_sleep_seconds (5); butler->rethrow (); } + +/** Test a crash when the gap between the last audio and the start of a silent period is more than 1 sample */ +BOOST_AUTO_TEST_CASE (player_silence_crash) +{ + shared_ptr film = new_test_film2 ("player_silence_crash"); + shared_ptr sine = content_factory("test/data/impulse_train.wav").front(); + film->examine_and_add_content (sine); + BOOST_REQUIRE (!wait_for_jobs()); + + sine->set_video_frame_rate (23.976); + film->write_metadata (); + film->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); +} + +/** Test a crash when processing a 3D DCP */ +BOOST_AUTO_TEST_CASE (player_3d_test_1) +{ + shared_ptr film = new_test_film2 ("player_3d_test_1a"); + shared_ptr left = content_factory("test/data/flat_red.png").front(); + film->examine_and_add_content (left); + shared_ptr right = content_factory("test/data/flat_blue.png").front(); + film->examine_and_add_content (right); + BOOST_REQUIRE (!wait_for_jobs()); + + left->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT); + left->set_position (film, DCPTime()); + right->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT); + right->set_position (film, DCPTime()); + film->set_three_d (true); + + film->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + + shared_ptr film2 = new_test_film2 ("player_3d_test_1b"); + shared_ptr dcp(new DCPContent(film->dir(film->dcp_name()))); + film2->examine_and_add_content (dcp); + BOOST_REQUIRE (!wait_for_jobs()); + + film2->set_three_d (true); + film2->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); +} + +/** Test a crash when processing a 3D DCP as content in a 2D project */ +BOOST_AUTO_TEST_CASE (player_3d_test_2) +{ + shared_ptr film = new_test_film2 ("player_3d_test_2a"); + shared_ptr left = content_factory("test/data/flat_red.png").front(); + film->examine_and_add_content (left); + shared_ptr right = content_factory("test/data/flat_blue.png").front(); + film->examine_and_add_content (right); + BOOST_REQUIRE (!wait_for_jobs()); + + left->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT); + left->set_position (film, DCPTime()); + right->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT); + right->set_position (film, DCPTime()); + film->set_three_d (true); + + film->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + + shared_ptr film2 = new_test_film2 ("player_3d_test_2b"); + shared_ptr dcp(new DCPContent(film->dir(film->dcp_name()))); + film2->examine_and_add_content (dcp); + BOOST_REQUIRE (!wait_for_jobs()); + + film2->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); +} + +/** Test a crash when there is video-only content at the end of the DCP and a frame-rate conversion is happening; + * #1691. + */ +BOOST_AUTO_TEST_CASE (player_silence_at_end_crash) +{ + /* 25fps DCP with some audio */ + shared_ptr film1 = new_test_film2 ("player_silence_at_end_crash_1"); + shared_ptr content1 = content_factory("test/data/flat_red.png").front(); + film1->examine_and_add_content (content1); + BOOST_REQUIRE (!wait_for_jobs()); + content1->video->set_length (25); + film1->set_video_frame_rate (25); + film1->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + + /* Make another project importing this DCP */ + shared_ptr film2 = new_test_film2 ("player_silence_at_end_crash_2"); + shared_ptr content2(new DCPContent(film1->dir(film1->dcp_name()))); + film2->examine_and_add_content (content2); + BOOST_REQUIRE (!wait_for_jobs()); + + /* and importing just the video MXF on its own at the end */ + optional video; + for (boost::filesystem::directory_iterator i(film1->dir(film1->dcp_name())); i != boost::filesystem::directory_iterator(); ++i) { + if (boost::starts_with(i->path().filename().string(), "j2c_")) { + video = i->path(); + } + } + + BOOST_REQUIRE (video); + shared_ptr content3 = content_factory(*video).front(); + film2->examine_and_add_content (content3); + BOOST_REQUIRE (!wait_for_jobs()); + content3->set_position (film2, DCPTime::from_seconds(1.5)); + film2->set_video_frame_rate (24); + std::cout << "Here we go.\n"; + film2->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); +}