X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=test%2Fsrt_subtitle_test.cc;h=918cdba796f5808f79a5417cec50a85b568fdf92;hb=07789030fb4ec7d48d14c2cbee0b32f616d6d93d;hp=4bf2e59ea248a774918b8575e1deffdee34b7087;hpb=903b6d12af93066bf2328a5f48a846f289c5b7b2;p=dcpomatic.git

diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index 4bf2e59ea..918cdba79 100644
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -22,9 +22,10 @@
  */
 
 #include "lib/film.h"
-#include "lib/subrip_content.h"
+#include "lib/text_subtitle_content.h"
 #include "lib/dcp_content_type.h"
 #include "lib/font.h"
+#include "lib/ratio.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
@@ -41,7 +42,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
-	shared_ptr<SubRipContent> content (new SubRipContent (film, "test/data/subrip2.srt"));
+	shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, "test/data/subrip2.srt"));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
@@ -61,14 +62,14 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test2)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
-	shared_ptr<SubRipContent> content (new SubRipContent (film, "test/data/subrip2.srt"));
+	shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, "test/data/subrip2.srt"));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
 	content->set_use_subtitles (true);
 	content->set_burn_subtitles (false);
 	/* Use test/data/subrip2.srt as if it were a font file  */
-	content->fonts().front()->set_file ("test/data/subrip2.srt");
+	content->fonts().front()->set_file (FontFiles::NORMAL, "test/data/subrip2.srt");
 
 	film->make_dcp ();
 	wait_for_jobs ();
@@ -86,7 +87,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
 	film->set_interop (true);
-	shared_ptr<SubRipContent> content (new SubRipContent (film, private_data / "Ankoemmling.srt"));
+	shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, private_data / "Ankoemmling.srt"));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
@@ -117,3 +118,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