PlainText -> PlainTextFile.

[dcpomatic.git] / test / player_test.cc

diff --git a/test/player_test.cc b/test/player_test.cc
index 0ddb67afcb70b817e718803190cc1ca0aa25ff93..a66860911bedcfcfaa2b3b60243fafe74f7d8ee2 100644 (file)
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -31,10 +31,10 @@
 #include "lib/player.h"
 #include "lib/video_content.h"
 #include "lib/image_content.h"
-#include "lib/text_subtitle_content.h"
+#include "lib/plain_text_file_content.h"
 #include "lib/content_factory.h"
 #include "lib/dcp_content.h"
-#include "lib/subtitle_content.h"
+#include "lib/text_content.h"
 #include "lib/butler.h"
 #include "lib/compose.hpp"
 #include "test.h"
@@ -92,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<ImageContent> contentA (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
        shared_ptr<ImageContent> contentB (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
 
@@ -180,7 +181,7 @@ BOOST_AUTO_TEST_CASE (player_interleave_test)
        film->examine_and_add_content (c);
        BOOST_REQUIRE (!wait_for_jobs ());
 
-       shared_ptr<TextSubtitleContent> s (new TextSubtitleContent (film, "test/data/subrip.srt"));
+       shared_ptr<PlainTextFileContent> s (new PlainTextFileContent (film, "test/data/subrip.srt"));
        film->examine_and_add_content (s);
        BOOST_REQUIRE (!wait_for_jobs ());
 
@@ -226,6 +227,58 @@ BOOST_AUTO_TEST_CASE (player_seek_test)
                pair<shared_ptr<PlayerVideo>, 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");
-               check_image(String::compose("test/data/player_seek_test_%1.png", i), String::compose("build/test/player_seek_test_%1.png", i));
+               /* 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> film (new Film (optional<boost::filesystem::path>()));
+       shared_ptr<DCPContent> 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> player (new Player (film, film->playlist()));
+       player->set_fast ();
+       player->set_always_burn_subtitles (true);
+       player->set_play_referenced ();
+
+       shared_ptr<Butler> 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<shared_ptr<PlayerVideo>, 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> film = new_test_film2 ("player_trim_test");
+       shared_ptr<Content> 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<Content> 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 ());
+}