Handle vertical alignment of subs correctly wrt the difference between Interop and...

[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 169a41751a6860929be63912d6356b040e42c695..cbfe6fdbe29866302a1ee7218e55c4f4d1ed253b 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -19,22 +19,21 @@
 */
 
 
-#include "dcp_subtitle_decoder.h"
 #include "dcp_subtitle_content.h"
+#include "dcp_subtitle_decoder.h"
 #include "font.h"
 #include "text_content.h"
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/load_font_node.h>
-#include <iostream>
 
 
-using std::cout;
+using std::dynamic_pointer_cast;
 using std::list;
+using std::make_shared;
+using std::shared_ptr;
 using std::string;
 using std::vector;
-using std::shared_ptr;
-using std::dynamic_pointer_cast;
-using std::make_shared;
+using boost::optional;
 using namespace dcpomatic;
 
 
@@ -42,53 +41,19 @@ DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<
        : Decoder (film)
 {
        /* Load the XML or MXF file */
-       shared_ptr<dcp::SubtitleAsset> const c = load (content->path(0));
-       c->fix_empty_font_ids ();
-       _subtitles = c->subtitles ();
+       auto const 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())));
-               }
+       if (dynamic_pointer_cast<dcp::InteropSubtitleAsset>(asset)) {
+               _standard = dcp::Standard::INTEROP;
+       } else {
+               _standard = dcp::Standard::SMPTE;
        }
+
+       text.push_back (make_shared<TextDecoder>(this, content->only_text()));
+       update_position();
 }
 
 
@@ -102,6 +67,8 @@ DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
        while (i != _subtitles.end() && ContentTime::from_seconds ((*_next)->in().as_seconds()) < time) {
                ++i;
        }
+
+       update_position();
 }
 
 
@@ -119,8 +86,8 @@ 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) {
@@ -141,7 +108,10 @@ DCPSubtitleDecoder::pass ()
                }
        }
 
-       only_text()->emit_plain (p, s);
+       only_text()->emit_plain(p, s, _standard);
+
+       update_position();
+
        return false;
 }
 
@@ -156,9 +126,25 @@ DCPSubtitleDecoder::content_time_period (shared_ptr<const dcp::Subtitle> s) cons
 }
 
 
-vector<dcpomatic::FontData>
-DCPSubtitleDecoder::fonts () const
+/** @return time of first subtitle, if there is one */
+optional<ContentTime>
+DCPSubtitleDecoder::first () const
+{
+       if (_subtitles.empty()) {
+               return {};
+       }
+
+       return ContentTime::from_seconds(_subtitles[0]->in().as_seconds());
+}
+
+
+void
+DCPSubtitleDecoder::update_position()
 {
-       return _fonts;
+       if (_next != _subtitles.end()) {
+               only_text()->maybe_set_position(
+                       ContentTime::from_seconds((*_next)->in().as_seconds())
+                       );
+       }
 }