Change video content scaling so that it either:

[dcpomatic.git] / test / dcp_subtitle_test.cc

diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 89eb11a6056b724ed4b232d4c643f30c8b1b03bc..80dacbb473dc161fa43a6096e83c351e3ccd1a70 100644 (file)
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -42,6 +42,7 @@ using std::cout;
 using std::list;
 using boost::shared_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 optional<ContentStringText> stored;
 
@@ -86,11 +87,11 @@ BOOST_AUTO_TEST_CASE (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(private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV"));
+       shared_ptr<DCPContent> content (new DCPContent(TestPaths::private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV"));
        film->examine_and_add_content (content);
        BOOST_REQUIRE (!wait_for_jobs ());
 
-       shared_ptr<DCPDecoder> decoder (new DCPDecoder (film, content, false));
+       shared_ptr<DCPDecoder> decoder (new DCPDecoder (film, content, false, false, shared_ptr<DCPDecoder>()));
        decoder->only_text()->PlainStart.connect (bind (store, _1));
 
        stored = optional<ContentStringText> ();
@@ -181,3 +182,39 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test4)
        doc.read_file (subtitle_file (film));
        BOOST_REQUIRE_EQUAL (doc.node_children("LoadFont").size(), 1);
 }
+
+static
+void
+check_font_tags (list<cxml::NodePtr> nodes)
+{
+       BOOST_FOREACH (cxml::NodePtr i, nodes) {
+               if (i->name() == "Font") {
+                       BOOST_CHECK (!i->optional_string_attribute("Id") || i->string_attribute("Id") != "");
+               }
+               check_font_tags (i->node_children());
+       }
+}
+
+/** Check that imported <LoadFont> tags with empty IDs (or corresponding Font tags with empty IDs)
+ *  are not passed through into the DCP.
+ */
+BOOST_AUTO_TEST_CASE (dcp_subtitle_test5)
+{
+       shared_ptr<Film> film = new_test_film2 ("dcp_subtitle_test5");
+       film->set_interop (true);
+
+       shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent("test/data/dcp_sub6.xml"));
+       film->examine_and_add_content (content);
+       BOOST_REQUIRE (!wait_for_jobs());
+
+       film->make_dcp ();
+       BOOST_REQUIRE (!wait_for_jobs());
+       film->write_metadata ();
+
+       cxml::Document doc ("DCSubtitle");
+       doc.read_file (subtitle_file(film));
+       BOOST_REQUIRE_EQUAL (doc.node_children("LoadFont").size(), 1);
+       BOOST_CHECK (doc.node_children("LoadFont").front()->string_attribute("Id") != "");
+
+       check_font_tags (doc.node_children());
+}