X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsrt_subtitle_test.cc;h=b6dce58f49b1c5014eb06f73c6f2703bffe0abaa;hb=65b331d32c383f3a9049f29bf03ab3fe3193b31a;hp=c2d3e27bd085d54dfac1a6d6012ecabe3f7dbd53;hpb=80400212e939dc2f3b987cb6df57709929aa5178;p=dcpomatic.git

diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index c2d3e27bd..b6dce58f4 100644
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -26,6 +26,7 @@
 #include "lib/dcp_content_type.h"
 #include "lib/font.h"
 #include "lib/ratio.h"
+#include "lib/subtitle_content.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
@@ -46,8 +47,8 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test)
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
-	content->set_use_subtitles (true);
-	content->set_burn_subtitles (false);
+	content->subtitle->set_use_subtitles (true);
+	content->subtitle->set_burn_subtitles (false);
 	film->make_dcp ();
 	wait_for_jobs ();
 
@@ -66,10 +67,10 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test2)
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
-	content->set_use_subtitles (true);
-	content->set_burn_subtitles (false);
+	content->subtitle->set_use_subtitles (true);
+	content->subtitle->set_burn_subtitles (false);
 	/* Use test/data/subrip2.srt as if it were a font file  */
-	content->fonts().front()->set_file (FontFiles::NORMAL, "test/data/subrip2.srt");
+	content->subtitle->fonts().front()->set_file (FontFiles::NORMAL, "test/data/subrip2.srt");
 
 	film->make_dcp ();
 	wait_for_jobs ();
@@ -91,8 +92,8 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
-	content->set_use_subtitles (true);
-	content->set_burn_subtitles (false);
+	content->subtitle->set_use_subtitles (true);
+	content->subtitle->set_burn_subtitles (false);
 
 	film->make_dcp ();
 	wait_for_jobs ();
@@ -118,3 +119,30 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
 		}
 	}
 }
+
+#if 0
+/* XXX: this is disabled; there is some difference in font rendering
+   between the test machine and others.
+*/
+
+/** Test rendering of a SubRip subtitle */
+BOOST_AUTO_TEST_CASE (srt_subtitle_test4)
+{
+	shared_ptr<Film> film = new_test_film ("subrip_render_test");
+	shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, "test/data/subrip.srt"));
+	content->examine (shared_ptr<Job> (), true);
+	BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds ((3 * 60) + 56.471));
+
+	shared_ptr<SubRipDecoder> decoder (new SubRipDecoder (content));
+	list<ContentTextSubtitle> cts = decoder->get_text_subtitles (
+		ContentTimePeriod (
+			ContentTime::from_seconds (109), ContentTime::from_seconds (110)
+			), false
+		);
+	BOOST_CHECK_EQUAL (cts.size(), 1);
+
+	PositionImage image = render_subtitles (cts.front().subs, dcp::Size (1998, 1080));
+	write_image (image.image, "build/test/subrip_render_test.png");
+	check_file ("build/test/subrip_render_test.png", "test/data/subrip_render_test.png");
+}
+#endif