X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fsrt_subtitle_test.cc;h=f441faffdb1c298f24007751aeb091c481918a78;hp=1837d816b4a7ff7a05735148c04ec22773f4f575;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=318a778b1b5c98b79b202dc953ff2ac131371a1b

diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index 1837d816b..f441faffd 100644
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -22,9 +23,11 @@
  */
 
 #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 "lib/subtitle_content.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
@@ -41,12 +44,12 @@ 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 ();
 
-	content->set_use_subtitles (true);
-	content->set_burn_subtitles (false);
+	content->subtitle->set_use (true);
+	content->subtitle->set_burn (false);
 	film->make_dcp ();
 	wait_for_jobs ();
 
@@ -61,14 +64,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);
+	content->subtitle->set_use (true);
+	content->subtitle->set_burn (false);
 	/* Use test/data/subrip2.srt as if it were a font file  */
-	content->fonts().front()->set_file ("test/data/subrip2.srt");
+	content->subtitle->fonts().front()->set_file (FontFiles::NORMAL, "test/data/subrip2.srt");
 
 	film->make_dcp ();
 	wait_for_jobs ();
@@ -86,12 +89,12 @@ 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 ();
 
-	content->set_use_subtitles (true);
-	content->set_burn_subtitles (false);
+	content->subtitle->set_use (true);
+	content->subtitle->set_burn (false);
 
 	film->make_dcp ();
 	wait_for_jobs ();
@@ -108,8 +111,6 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
 				j != boost::filesystem::directory_iterator ();
 				++j) {
 
-				std::cout << j->path().string() << "\n";
-
 				if (boost::algorithm::starts_with (j->path().leaf().string(), "sub_")) {
 					list<string> ignore;
 					ignore.push_back ("SubtitleID");
@@ -119,3 +120,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