X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fplayer_test.cc;h=15bdb617fbb99c26f6da3495d183cf1564230965;hp=0c9b6f21f0a8c81f55b0e13e383ccc5802b3148b;hb=6cc7359c1af897f334dab5ba455707ce0c59af9d;hpb=ed68bfad5c795afb342c5228f3c1dc7770a6d646 diff --git a/test/player_test.cc b/test/player_test.cc index 0c9b6f21f..15bdb617f 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -37,6 +37,7 @@ #include "lib/text_content.h" #include "lib/butler.h" #include "lib/compose.hpp" +#include "lib/cross.h" #include "test.h" #include #include @@ -62,12 +63,12 @@ BOOST_AUTO_TEST_CASE (player_silence_padding_test) { shared_ptr film = new_test_film ("player_silence_padding_test"); film->set_name ("player_silence_padding_test"); - shared_ptr c (new FFmpegContent (film, "test/data/test.mp4")); + shared_ptr c (new FFmpegContent("test/data/test.mp4")); film->set_container (Ratio::from_id ("185")); film->set_audio_channels (6); film->examine_and_add_content (c); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); accumulated.reset (new AudioBuffers (film->audio_channels(), 0)); @@ -93,23 +94,23 @@ BOOST_AUTO_TEST_CASE (player_black_fill_test) film->set_container (Ratio::from_id ("185")); film->set_sequence (false); film->set_interop (false); - shared_ptr contentA (new ImageContent (film, "test/data/simple_testcard_640x480.png")); - shared_ptr contentB (new ImageContent (film, "test/data/simple_testcard_640x480.png")); + shared_ptr contentA (new ImageContent("test/data/simple_testcard_640x480.png")); + shared_ptr contentB (new ImageContent("test/data/simple_testcard_640x480.png")); film->examine_and_add_content (contentA); film->examine_and_add_content (contentB); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); contentA->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); contentA->video->set_length (3); - contentA->set_position (DCPTime::from_frames (2, film->video_frame_rate ())); + contentA->set_position (film, DCPTime::from_frames(2, film->video_frame_rate())); contentB->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); contentB->video->set_length (1); - contentB->set_position (DCPTime::from_frames (7, film->video_frame_rate ())); + contentB->set_position (film, DCPTime::from_frames(7, film->video_frame_rate())); film->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); boost::filesystem::path ref; ref = "test"; @@ -132,17 +133,17 @@ 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")); - shared_ptr A = content_factory(film, "test/data/flat_red.png").front(); + shared_ptr A = content_factory("test/data/flat_red.png").front(); film->examine_and_add_content (A); BOOST_REQUIRE (!wait_for_jobs ()); - shared_ptr B = content_factory(film, "test/data/awkward_length.wav").front(); + shared_ptr B = content_factory("test/data/awkward_length.wav").front(); film->examine_and_add_content (B); BOOST_REQUIRE (!wait_for_jobs ()); film->set_video_frame_rate (24); A->video->set_length (3 * 24); - BOOST_CHECK (A->full_length() == DCPTime::from_frames(3 * 24, 24)); - BOOST_CHECK (B->full_length() == DCPTime(289920)); + BOOST_CHECK (A->full_length(film) == DCPTime::from_frames(3 * 24, 24)); + BOOST_CHECK (B->full_length(film) == DCPTime(289920)); /* 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)); @@ -177,11 +178,11 @@ BOOST_AUTO_TEST_CASE (player_interleave_test) film->set_container (Ratio::from_id ("185")); film->set_audio_channels (6); - shared_ptr c (new FFmpegContent (film, "test/data/test.mp4")); + shared_ptr c (new FFmpegContent("test/data/test.mp4")); film->examine_and_add_content (c); BOOST_REQUIRE (!wait_for_jobs ()); - shared_ptr s (new StringTextFileContent (film, "test/data/subrip.srt")); + shared_ptr s (new StringTextFileContent("test/data/subrip.srt")); film->examine_and_add_content (s); BOOST_REQUIRE (!wait_for_jobs ()); @@ -202,7 +203,7 @@ 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 (film, private_data / "awkward_subs")); + shared_ptr dcp (new DCPContent(private_data / "awkward_subs")); film->examine_and_add_content (dcp, true); BOOST_REQUIRE (!wait_for_jobs ()); dcp->only_text()->set_use (true); @@ -212,7 +213,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test) player->set_always_burn_open_subtitles (); player->set_play_referenced (); - shared_ptr butler (new Butler (player, film->log(), AudioMapping(), 2)); + shared_ptr butler (new Butler (player, AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)); butler->disable_audio(); for (int i = 0; i < 10; ++i) { @@ -233,7 +234,7 @@ 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 (film, private_data / "awkward_subs2")); + shared_ptr dcp (new DCPContent(private_data / "awkward_subs2")); film->examine_and_add_content (dcp, true); BOOST_REQUIRE (!wait_for_jobs ()); dcp->only_text()->set_use (true); @@ -243,7 +244,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test2) player->set_always_burn_open_subtitles (); player->set_play_referenced (); - shared_ptr butler (new Butler (player, film->log(), AudioMapping(), 2)); + shared_ptr butler (new Butler(player, AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)); butler->disable_audio(); butler->seek(DCPTime::from_seconds(5), true); @@ -262,15 +263,15 @@ BOOST_AUTO_TEST_CASE (player_seek_test2) BOOST_AUTO_TEST_CASE (player_trim_test) { shared_ptr film = new_test_film2 ("player_trim_test"); - shared_ptr A = content_factory(film, "test/data/flat_red.png").front(); + shared_ptr A = content_factory("test/data/flat_red.png").front(); film->examine_and_add_content (A); BOOST_REQUIRE (!wait_for_jobs ()); A->video->set_length (10 * 24); - shared_ptr B = content_factory(film, "test/data/flat_red.png").front(); + shared_ptr B = content_factory("test/data/flat_red.png").front(); film->examine_and_add_content (B); BOOST_REQUIRE (!wait_for_jobs ()); B->video->set_length (10 * 24); - B->set_position (DCPTime::from_seconds (10)); + B->set_position (film, DCPTime::from_seconds(10)); B->set_trim_start (ContentTime::from_seconds (2)); film->make_dcp (); @@ -299,9 +300,9 @@ 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(film, private_data / "boon_telly.mkv").front(); + shared_ptr ff = content_factory(private_data / "boon_telly.mkv").front(); film->examine_and_add_content (ff); - shared_ptr text = content_factory(film, "test/data/subrip.srt").front(); + shared_ptr text = content_factory("test/data/subrip.srt").front(); film->examine_and_add_content (text); BOOST_REQUIRE (!wait_for_jobs()); text->only_text()->set_type (TEXT_CLOSED_CAPTION); @@ -317,3 +318,28 @@ BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test) BOOST_CHECK_EQUAL (out.size(), 6); } + +/** Trigger a crash due to the assertion failure in Player::emit_audio */ +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(); + film->examine_and_add_content (boon); + BOOST_REQUIRE (!wait_for_jobs()); + + shared_ptr player (new Player(film, film->playlist())); + 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); + + boon->set_trim_start (ContentTime::from_seconds(5)); + + butler->seek (DCPTime(), true); + + /* Wait for the butler to refill */ + dcpomatic_sleep (5); + + butler->rethrow (); +}