X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_subtitle_test.cc;h=5d77681e9ab7a0a70c9ea260029e2e223d002001;hb=0758d834992f0adb8aa8d4d9908a64ce8708f05c;hp=95fa7d1ec7eaf2d6844892ac9b9d1ddf1d8ed258;hpb=f4030653da8f5a0b3daebe640f485b3daf9ef091;p=dcpomatic.git

diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 95fa7d1ec..5d77681e9 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -24,14 +24,21 @@
 #include <boost/test/unit_test.hpp>
 #include "lib/film.h"
 #include "lib/dcp_subtitle_content.h"
+#include "lib/dcp_content.h"
 #include "lib/ratio.h"
+#include "lib/dcp_decoder.h"
 #include "lib/dcp_content_type.h"
+#include "lib/subtitle_content.h"
+#include "lib/content_subtitle.h"
+#include "lib/subtitle_decoder.h"
 #include "test.h"
+#include <iostream>
 
 using std::cout;
+using std::list;
 using boost::shared_ptr;
 
-/** Test load of very simple DCP subtitle file */
+/** Test pass-through of a very simple DCP subtitle file */
 BOOST_AUTO_TEST_CASE (dcp_subtitle_test)
 {
 	shared_ptr<Film> film = new_test_film ("dcp_subtitle_test");
@@ -43,4 +50,53 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test)
 	wait_for_jobs ();
 
 	BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (2));
+
+	content->subtitle->set_use (true);
+	content->subtitle->set_burn (false);
+	film->make_dcp ();
+	wait_for_jobs ();
+
+	check_dcp ("test/data/dcp_subtitle_test", film->dir (film->dcp_name ()));
+}
+
+/** Test parsing of a subtitle within an existing DCP */
+BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test)
+{
+	shared_ptr<Film> film = new_test_film ("dcp_subtitle_within_dcp_test");
+	film->set_container (Ratio::from_id ("185"));
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
+	film->set_name ("frobozz");
+	shared_ptr<DCPContent> content (new DCPContent (film, private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV"));
+	film->examine_and_add_content (content);
+	wait_for_jobs ();
+
+	shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, film->log(), false));
+
+	list<ContentTimePeriod> ctp = decoder->text_subtitles_during (
+		ContentTimePeriod (
+			ContentTime::from_seconds (25),
+			ContentTime::from_seconds (26)
+			),
+		true
+		);
+
+	BOOST_REQUIRE_EQUAL (ctp.size(), 2);
+	BOOST_CHECK_EQUAL (ctp.front().from, ContentTime::from_seconds (25 + 12 * 0.04));
+	BOOST_CHECK_EQUAL (ctp.front().to, ContentTime::from_seconds (26 + 4 * 0.04));
+	BOOST_CHECK_EQUAL (ctp.back().from, ContentTime::from_seconds (25 + 12 * 0.04));
+	BOOST_CHECK_EQUAL (ctp.back().to, ContentTime::from_seconds (26 + 4 * 0.04));
+
+	list<ContentTextSubtitle> subs = decoder->subtitle->get_text (
+		ContentTimePeriod (
+			ContentTime::from_seconds (25),
+			ContentTime::from_seconds (26)
+			),
+		true,
+		true
+		);
+
+	BOOST_REQUIRE_EQUAL (subs.size(), 1);
+	BOOST_REQUIRE_EQUAL (subs.front().subs.size(), 2);
+	BOOST_CHECK_EQUAL (subs.front().subs.front().text(), "Noch mal.");
+	BOOST_CHECK_EQUAL (subs.front().subs.back().text(), "Encore une fois.");
 }