X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fdcp_subtitle_test.cc;h=ef733d370d5bde31b15f0fa56c6e646a7171d024;hp=e8a5a4c04cb25d0ae08b4c590fcee48e74faa48c;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=5ce9c7026366d82233e8852b9b949362ed2f6191

diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index e8a5a4c04..ef733d370 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014 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/>.
 
 */
 
@@ -24,11 +25,18 @@
 #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 pass-through of a very simple DCP subtitle file */
@@ -44,10 +52,52 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test)
 
 	BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (2));
 
-	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 ();
 
 	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.");
+}