Don't ignore font settings for DCP subtitles (#2074).

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index b3240491f829dd0d64fa92f0128569e13b5214d4..169a41751a6860929be63912d6356b040e42c695 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -21,6 +21,8 @@
 
 #include "dcp_subtitle_decoder.h"
 #include "dcp_subtitle_content.h"
+#include "font.h"
+#include "text_content.h"
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/load_font_node.h>
 #include <iostream>
@@ -39,7 +41,8 @@ using namespace dcpomatic;
 DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<const DCPSubtitleContent> content)
        : Decoder (film)
 {
-       auto c = load (content->path(0));
+       /* Load the XML or MXF file */
+       shared_ptr<dcp::SubtitleAsset> const c = load (content->path(0));
        c->fix_empty_font_ids ();
        _subtitles = c->subtitles ();
        _next = _subtitles.begin ();
@@ -50,14 +53,39 @@ DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<
        }
        text.push_back (make_shared<TextDecoder>(this, content->only_text(), first));
 
-       auto fm = c->font_data();
-       for (auto const& i: fm) {
-               _fonts.push_back (FontData(i.first, i.second));
+       /* The fonts that are included in content's file; if it's interop there will be none
+        * (as the fonts are held in separate assets).
+        */
+       auto fonts_in_asset = c->font_data();
+
+       /* Fonts specified in the TextContent */
+       list<shared_ptr<dcpomatic::Font>> fonts_in_content;
+       for (auto i: content->text) {
+               auto this_fonts = i->fonts();
+               std::copy(this_fonts.begin(), this_fonts.end(), std::back_inserter(fonts_in_content));
        }
+       fonts_in_content.sort();
+       fonts_in_content.unique();
 
-       /* Add a default font for any LoadFont nodes in our file which we haven't yet found fonts for */
+       /* Find a font for each <LoadFont> Node */
        for (auto i: c->load_font_nodes()) {
-               if (fm.find(i->id) == fm.end()) {
+               bool done = false;
+               for (auto j: fonts_in_content) {
+                       if (j->id() == i->id && j->file()) {
+                               // One was specified in the content
+                               _fonts.push_back (FontData(i->id, dcp::ArrayData(*j->file())));
+                               done = true;
+                       }
+               }
+               if (!done) {
+                       if (fonts_in_asset.find(i->id) != fonts_in_asset.end()) {
+                               // One was included in the subtitle file
+                               _fonts.push_back (FontData(i->id, fonts_in_asset[i->id]));
+                               done = true;
+                       }
+               }
+               if (!done) {
+                       // Give up and add a default
                        _fonts.push_back (FontData(i->id, dcp::ArrayData(default_font_file())));
                }
        }

diff --git a/src/lib/font.h b/src/lib/font.h
index ed3ecc38f3075498d2051545a38df5ab4c2382fb..a6bf61e340c445c25970e620c15ac1d489b7efa4 100644 (file)
--- a/src/lib/font.h
+++ b/src/lib/font.h
@@ -41,6 +41,11 @@ public:
 
        explicit Font (cxml::NodePtr node);
 
+       Font (std::string id, boost::filesystem::path file)
+               : _id (id)
+               , _file (file)
+       {}
+
        void as_xml (xmlpp::Node* node);
 
        std::string id () const {

diff --git a/test/data b/test/data
index 246bb9adf94bc72bfe52394eacc88d6419605acb..20f8eb1486ab297eec9f3a7312833354f5b506e2 160000 (submodule)
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit 246bb9adf94bc72bfe52394eacc88d6419605acb
+Subproject commit 20f8eb1486ab297eec9f3a7312833354f5b506e2

diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index d923448d3afffa418a608454edcd0d2a21d79e92..fb8888d0c6859edccdec7e665c1d97a49c9a5710 100644 (file)
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -228,3 +228,19 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test5)
 
        check_font_tags (doc.node_children());
 }
+
+
+/** Check that fonts specified in the DoM content are used in the output and not ignored (#2074) */
+BOOST_AUTO_TEST_CASE (test_font_override)
+{
+       auto content = make_shared<DCPSubtitleContent>("test/data/dcp_sub4.xml");
+       auto film = new_test_film2("test_font_override", {content});
+       film->set_interop(true);
+
+       BOOST_REQUIRE_EQUAL(content->text.size(), 1U);
+       content->text.front()->add_font(make_shared<dcpomatic::Font>("theFontId", "test/data/Inconsolata-VF.ttf"));
+
+       make_and_verify_dcp (film, { dcp::VerificationNote::Code::INVALID_STANDARD });
+       check_file (subtitle_file(film).parent_path() / "font_0.ttf", "test/data/Inconsolata-VF.ttf");
+}
+