Emit no audio from DCPs if none is mapped

[dcpomatic.git] / src / lib / dcp_subtitle_decoder.cc

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index d5cbabf1b51d5e65f652638a8518adbd3d2859de..711dc77f263e6cf7d2d64ba40bc877f33a6a761d 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -21,8 +21,10 @@
 
 #include "dcp_subtitle_content.h"
 #include "dcp_subtitle_decoder.h"
+#include "film.h"
 #include "font.h"
 #include "text_content.h"
+#include "util.h"
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/load_font_node.h>
 
@@ -41,53 +43,22 @@ DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<
        : Decoder (film)
 {
        /* Load the XML or MXF file */
-       auto const c = load (content->path(0));
-       c->fix_empty_font_ids ();
-       _subtitles = c->subtitles ();
+       _asset = load(content->path(0));
+       _asset->fix_empty_font_ids();
+       _subtitles = _asset->subtitles();
        _next = _subtitles.begin ();
 
-       ContentTime first;
-       if (_next != _subtitles.end()) {
-               first = content_time_period(*_next).from;
-       }
-       text.push_back (make_shared<TextDecoder>(this, content->only_text(), first));
-
-       /* 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();
-
-       /* Find a font for each <LoadFont> Node */
-       for (auto i: c->load_font_nodes()) {
-               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())));
-               }
+       _subtitle_standard = _asset->subtitle_standard();
+
+       text.push_back (make_shared<TextDecoder>(this, content->only_text()));
+       update_position();
+
+       FontIDAllocator font_id_allocator;
+
+       for (auto node: _asset->load_font_nodes()) {
+               _font_id_allocator.add_font(0, _asset->id(), node->id);
        }
+       _font_id_allocator.allocate();
 }
 
 
@@ -101,6 +72,8 @@ DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
        while (i != _subtitles.end() && ContentTime::from_seconds ((*_next)->in().as_seconds()) < time) {
                ++i;
        }
+
+       update_position();
 }
 
 
@@ -118,14 +91,20 @@ DCPSubtitleDecoder::pass ()
           time of emitting the first.
        */
 
-       list<dcp::SubtitleString> s;
-       list<dcp::SubtitleImage> i;
+       vector<dcp::SubtitleString> s;
+       vector<dcp::SubtitleImage> i;
        auto const p = content_time_period (*_next);
 
        while (_next != _subtitles.end () && content_time_period (*_next) == p) {
                auto ns = dynamic_pointer_cast<const dcp::SubtitleString>(*_next);
                if (ns) {
-                       s.push_back (*ns);
+                       dcp::SubtitleString ns_copy = *ns;
+                       if (ns_copy.font()) {
+                               ns_copy.set_font(_font_id_allocator.font_id(0, _asset->id(), ns_copy.font().get()));
+                       } else {
+                               ns_copy.set_font(_font_id_allocator.default_font_id());
+                       }
+                       s.push_back(ns_copy);
                        ++_next;
                } else {
                        /* XXX: perhaps these image subs should also be collected together like the string ones are;
@@ -140,7 +119,10 @@ DCPSubtitleDecoder::pass ()
                }
        }
 
-       only_text()->emit_plain (p, s);
+       only_text()->emit_plain(p, s, _subtitle_standard);
+
+       update_position();
+
        return false;
 }
 
@@ -155,13 +137,6 @@ DCPSubtitleDecoder::content_time_period (shared_ptr<const dcp::Subtitle> s) cons
 }
 
 
-vector<dcpomatic::FontData>
-DCPSubtitleDecoder::fonts () const
-{
-       return _fonts;
-}
-
-
 /** @return time of first subtitle, if there is one */
 optional<ContentTime>
 DCPSubtitleDecoder::first () const
@@ -172,3 +147,15 @@ DCPSubtitleDecoder::first () const
 
        return ContentTime::from_seconds(_subtitles[0]->in().as_seconds());
 }
+
+
+void
+DCPSubtitleDecoder::update_position()
+{
+       if (_next != _subtitles.end()) {
+               only_text()->maybe_set_position(
+                       ContentTime::from_seconds((*_next)->in().as_seconds())
+                       );
+       }
+}
+