projects / dcpomatic.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Take Film pointer out of Content.
[dcpomatic.git] / test / dcp_subtitle_test.cc
diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 92a415ae121fc309f2cc7ae0bd2e80ccee342915..5a1cf4391123eacee35b2db6e0e3b3cbeeb155c4 100644 (file)
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -31,9 +31,10 @@
 #include "lib/dcp_decoder.h"
 #include "lib/dcp_content_type.h"
 #include "lib/dcp_subtitle_decoder.h"
-#include "lib/subtitle_content.h"
-#include "lib/content_subtitle.h"
-#include "lib/subtitle_decoder.h"
+#include "lib/text_content.h"
+#include "lib/content_text.h"
+#include "lib/font.h"
+#include "lib/text_decoder.h"
 #include "test.h"
 #include <iostream>
 
@@ -42,12 +43,18 @@ using std::list;
 using boost::shared_ptr;
 using boost::optional;
 
-optional<ContentTextSubtitle> stored;
+optional<ContentStringText> stored;
 
 static void
-store (ContentTextSubtitle sub)
+store (ContentStringText sub)
 {
-       stored = sub;
+       if (!stored) {
+               stored = sub;
+       } else {
+               BOOST_FOREACH (dcp::SubtitleString i, sub.subs) {
+                       stored->subs.push_back (i);
+               }
+       }
 }
 
 /** Test pass-through of a very simple DCP subtitle file */
@@ -57,16 +64,17 @@ BOOST_AUTO_TEST_CASE (dcp_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<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub.xml"));
+       film->set_interop (false);
+       shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent ("test/data/dcp_sub.xml"));
        film->examine_and_add_content (content);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs ());
 
-       BOOST_CHECK_EQUAL (content->full_length().get(), DCPTime::from_seconds(2).get());
+       BOOST_CHECK_EQUAL (content->full_length(film).get(), DCPTime::from_seconds(2).get());
 
-       content->subtitle->set_use (true);
-       content->subtitle->set_burn (false);
+       content->only_text()->set_use (true);
+       content->only_text()->set_burn (false);
        film->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs ());
 
        check_dcp ("test/data/dcp_subtitle_test", film->dir (film->dcp_name ()));
 }
@@ -78,15 +86,15 @@ 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 (film, private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV"));
+       shared_ptr<DCPContent> content (new DCPContent(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 ();
+       BOOST_REQUIRE (!wait_for_jobs ());
 
-       shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, film->log()));
-       decoder->subtitle->TextData.connect (bind (store, _1));
+       shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, false));
+       decoder->only_text()->PlainStart.connect (bind (store, _1));
 
-       stored = optional<ContentTextSubtitle> ();
-       while (!decoder->pass() && !stored) {}
+       stored = optional<ContentStringText> ();
+       while (!decoder->pass(film) && !stored) {}
 
        BOOST_REQUIRE (stored);
        BOOST_REQUIRE_EQUAL (stored->subs.size(), 2);
@@ -101,16 +109,16 @@ BOOST_AUTO_TEST_CASE (dcp_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<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub2.xml"));
+       shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent("test/data/dcp_sub2.xml"));
        film->examine_and_add_content (content);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs ());
 
-       shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content, film->log()));
-       decoder->subtitle->TextData.connect (bind (store, _1));
+       shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder(content));
+       decoder->only_text()->PlainStart.connect (bind (store, _1));
 
-       stored = optional<ContentTextSubtitle> ();
-       while (!decoder->pass ()) {
-               if (stored && stored->period().from == ContentTime(0)) {
+       stored = optional<ContentStringText> ();
+       while (!decoder->pass(film)) {
+               if (stored && stored->from() == ContentTime(0)) {
                        BOOST_CHECK_EQUAL (stored->subs.front().text(), "&lt;b&gt;Hello world!&lt;/b&gt;");
                }
        }
@@ -124,18 +132,18 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test3)
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
        film->set_name ("frobozz");
        film->set_interop (true);
-       shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub3.xml"));
+       shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent ("test/data/dcp_sub3.xml"));
        film->examine_and_add_content (content);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs ());
 
        film->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs ());
 
-       shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content, film->log()));
-       stored = optional<ContentTextSubtitle> ();
-       while (!decoder->pass ()) {
-               decoder->subtitle->TextData.connect (bind (store, _1));
-               if (stored && stored->period().from == ContentTime::from_seconds(0.08)) {
+       shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content));
+       stored = optional<ContentStringText> ();
+       while (!decoder->pass (film)) {
+               decoder->only_text()->PlainStart.connect (bind (store, _1));
+               if (stored && stored->from() == ContentTime::from_seconds(0.08)) {
                        list<dcp::SubtitleString> s = stored->subs;
                        list<dcp::SubtitleString>::const_iterator i = s.begin ();
                        BOOST_CHECK_EQUAL (i->text(), "This");
@@ -150,3 +158,26 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test3)
                }
        }
 }
+
+/** Check that Interop DCPs aren't made with more than one <LoadFont> (#1273) */
+BOOST_AUTO_TEST_CASE (dcp_subtitle_test4)
+{
+       shared_ptr<Film> film = new_test_film2 ("dcp_subtitle_test4");
+       film->set_interop (true);
+
+       shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent ("test/data/dcp_sub3.xml"));
+       film->examine_and_add_content (content);
+       shared_ptr<DCPSubtitleContent> content2 (new DCPSubtitleContent ("test/data/dcp_sub3.xml"));
+       film->examine_and_add_content (content2);
+       BOOST_REQUIRE (!wait_for_jobs ());
+
+       content->only_text()->add_font (shared_ptr<Font> (new Font ("font1")));
+       content2->only_text()->add_font (shared_ptr<Font> (new Font ("font2")));
+
+       film->make_dcp ();
+       BOOST_REQUIRE (!wait_for_jobs ());
+
+       cxml::Document doc ("DCSubtitle");
+       doc.read_file (subtitle_file (film));
+       BOOST_REQUIRE_EQUAL (doc.node_children("LoadFont").size(), 1);
+}
2.0 development branch of dcpomatic