X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fplayer_test.cc;h=7cc3bc27b0550c39b88f80bb4f8e1e14a629c36d;hp=8d557322a84bcecd216e9a272225bc3d43535e3c;hb=c53c3e9f3d08478a391bfa1989772378609af693;hpb=3ad101373a6e189587e035d1b01389f52134af8a diff --git a/test/player_test.cc b/test/player_test.cc index 8d557322a..7cc3bc27b 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -31,16 +31,22 @@ #include "lib/player.h" #include "lib/video_content.h" #include "lib/image_content.h" -#include "lib/text_subtitle_content.h" +#include "lib/plain_text_content.h" #include "lib/content_factory.h" +#include "lib/dcp_content.h" +#include "lib/text_content.h" +#include "lib/butler.h" +#include "lib/compose.hpp" #include "test.h" #include #include using std::cout; using std::list; +using std::pair; using boost::shared_ptr; using boost::bind; +using boost::optional; static shared_ptr accumulated; @@ -86,6 +92,7 @@ BOOST_AUTO_TEST_CASE (player_black_fill_test) film->set_name ("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")); @@ -174,7 +181,7 @@ BOOST_AUTO_TEST_CASE (player_interleave_test) film->examine_and_add_content (c); BOOST_REQUIRE (!wait_for_jobs ()); - shared_ptr s (new TextSubtitleContent (film, "test/data/subrip.srt")); + shared_ptr s (new PlainTextContent (film, "test/data/subrip.srt")); film->examine_and_add_content (s); BOOST_REQUIRE (!wait_for_jobs ()); @@ -186,3 +193,92 @@ BOOST_AUTO_TEST_CASE (player_interleave_test) BOOST_CHECK (abs(video_frames - (audio_frames / 2000)) < 8); } } + +static void +note_handler (dcp::NoteType, std::string) +{ + +} + +/** Test some seeks towards the start of a DCP with awkward subtitles; see mantis #1085 + * and a number of others. I thought this was a player seek bug but in fact it was + * caused by the subtitle starting just after the start of the video frame and hence + * being faded out. + */ +BOOST_AUTO_TEST_CASE (player_seek_test) +{ + shared_ptr film (new Film (optional())); + shared_ptr dcp (new DCPContent (film, private_data / "awkward_subs")); + film->examine_and_add_content (dcp, true); + BOOST_REQUIRE (!wait_for_jobs ()); + dcp->subtitle->set_use (true); + + shared_ptr player (new Player (film, film->playlist())); + player->set_fast (); + player->set_always_burn_subtitles (true); + player->set_play_referenced (); + + shared_ptr butler (new Butler (player, film->log(), AudioMapping(), 2)); + butler->disable_audio(); + + for (int i = 0; i < 10; ++i) { + DCPTime t = DCPTime::from_frames (i, 24); + butler->seek (t, true); + pair, DCPTime> video = butler->get_video(); + BOOST_CHECK_EQUAL(video.second.get(), t.get()); + write_image(video.first->image(note_handler, PlayerVideo::always_rgb, false, true), String::compose("build/test/player_seek_test_%1.png", i), "RGB"); + /* This 0.011 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. + */ + check_image(String::compose("test/data/player_seek_test_%1.png", i), String::compose("build/test/player_seek_test_%1.png", i), 0.011); + } +} + +/** Test some more seeks towards the start of a DCP with awkward subtitles */ +BOOST_AUTO_TEST_CASE (player_seek_test2) +{ + shared_ptr film (new Film (optional())); + shared_ptr dcp (new DCPContent (film, private_data / "awkward_subs2")); + film->examine_and_add_content (dcp, true); + BOOST_REQUIRE (!wait_for_jobs ()); + dcp->subtitle->set_use (true); + + shared_ptr player (new Player (film, film->playlist())); + player->set_fast (); + player->set_always_burn_subtitles (true); + player->set_play_referenced (); + + shared_ptr butler (new Butler (player, film->log(), AudioMapping(), 2)); + butler->disable_audio(); + + butler->seek(DCPTime::from_seconds(5), true); + + for (int i = 0; i < 10; ++i) { + DCPTime t = DCPTime::from_seconds(5) + DCPTime::from_frames (i, 24); + butler->seek (t, true); + pair, DCPTime> video = butler->get_video(); + BOOST_CHECK_EQUAL(video.second.get(), t.get()); + write_image(video.first->image(note_handler, PlayerVideo::always_rgb, false, true), String::compose("build/test/player_seek_test2_%1.png", i), "RGB"); + check_image(String::compose("test/data/player_seek_test2_%1.png", i), String::compose("build/test/player_seek_test2_%1.png", i), 0.011); + } +} + +/** Test a bug when trimmed content follows other content */ +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(); + 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(); + 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_trim_start (ContentTime::from_seconds (2)); + + film->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs ()); +}