Fix font_id_map errors when importing DCP subtitles that have no

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

diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc
index d485ef64b837e03bee5261cc5f21923a216bafb6..fa5ed6c7a1025b441010e625bbdffa83e60f2ac8 100644 (file)
--- a/src/lib/text_decoder.cc
+++ b/src/lib/text_decoder.cc
@@ -41,12 +41,10 @@ using namespace dcpomatic;
 
 TextDecoder::TextDecoder (
        Decoder* parent,
-       shared_ptr<const TextContent> content,
-       ContentTime first
+       shared_ptr<const TextContent> content
        )
        : DecoderPart (parent)
        , _content (content)
-       , _position (first)
 {
 
 }
@@ -63,7 +61,7 @@ void
 TextDecoder::emit_bitmap_start (ContentBitmapText const& bitmap)
 {
        BitmapStart (bitmap);
-       _position = bitmap.from();
+       maybe_set_position(bitmap.from());
 }
 
 
@@ -83,7 +81,7 @@ escape_text (string text)
 
 static
 void
-set_forced_appearance(shared_ptr<const TextContent> content, dcp::SubtitleString& subtitle)
+set_forced_appearance(shared_ptr<const TextContent> content, StringText& subtitle)
 {
        if (content->colour()) {
                subtitle.set_colour(*content->colour());
@@ -104,15 +102,24 @@ set_forced_appearance(shared_ptr<const TextContent> content, dcp::SubtitleString
 
 
 void
-TextDecoder::emit_plain_start (ContentTime from, vector<dcp::SubtitleString> subtitles)
+TextDecoder::emit_plain_start (ContentTime from, vector<dcp::SubtitleString> subtitles, dcp::Standard valign_standard)
 {
+       vector<StringText> string_texts;
+
        for (auto& subtitle: subtitles) {
-               subtitle.set_text(escape_text(subtitle.text()));
-               set_forced_appearance(content(), subtitle);
+               auto string_text = StringText(
+                       subtitle,
+                       content()->outline_width(),
+                       content()->get_font(subtitle.font().get_value_or("")),
+                       valign_standard
+                       );
+               string_text.set_text(escape_text(string_text.text()));
+               set_forced_appearance(content(), string_text);
+               string_texts.push_back(string_text);
        }
 
-       PlainStart(ContentStringText(from, subtitles));
-       _position = from;
+       PlainStart(ContentStringText(from, string_texts));
+       maybe_set_position(from);
 }
 
 
@@ -143,7 +150,7 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & sub_subti
                }
        }
 
-       vector<dcp::SubtitleString> dcp_subtitles;
+       vector<StringText> string_texts;
        for (auto line: sub_subtitle.lines) {
                for (auto block: line.blocks) {
 
@@ -160,10 +167,10 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & sub_subti
                                switch (line.vertical_position.reference.get_value_or(sub::BOTTOM_OF_SCREEN)) {
                                case sub::BOTTOM_OF_SCREEN:
                                case sub::TOP_OF_SUBTITLE:
-                                       /* This 1.015 is an arbitrary value to lift the bottom sub off the bottom
+                                       /* This 0.9 is an arbitrary value to lift the bottom sub off the bottom
                                           of the screen a bit to a pleasing degree.
                                           */
-                                       v_position = 1.015 -
+                                       v_position = 0.9 -
                                                (1 + bottom_line.get() - line.vertical_position.line.get()) * multiplier;
 
                                        v_align = dcp::VAlign::TOP;
@@ -233,42 +240,49 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & sub_subti
                           content by the other emit_plain_start() above.
                        */
 
-                       dcp_subtitles.push_back(
-                               dcp::SubtitleString (
-                                       string(TEXT_FONT_ID),
-                                       block.italic,
-                                       block.bold,
-                                       block.underline,
-                                       block.colour.dcp(),
-                                       block.font_size.points (72 * 11),
-                                       1.0,
-                                       dcp::Time (from.seconds(), 1000),
-                                       /* XXX: hmm; this is a bit ugly (we don't know the to time yet) */
-                                       dcp::Time (),
-                                       h_position,
-                                       h_align,
-                                       v_position,
-                                       v_align,
-                                       dcp::Direction::LTR,
-                                       block.text,
-                                       dcp::Effect::NONE,
-                                       block.effect_colour.get_value_or(sub::Colour(0, 0, 0)).dcp(),
-                                       /* Hack: we should use subtitle.fade_up and subtitle.fade_down here
-                                          but the times of these often don't have a frame rate associated
-                                          with them so the sub::Time won't convert them to milliseconds without
-                                          throwing an exception.  Since only DCP subs fill those in (and we don't
-                                          use libsub for DCP subs) we can cheat by just putting 0 in here.
-                                       */
-                                       dcp::Time (),
-                                       dcp::Time (),
-                                       0
-                                       )
+                       auto dcp_subtitle = dcp::SubtitleString(
+                               optional<string>(),
+                               block.italic,
+                               block.bold,
+                               block.underline,
+                               block.colour.dcp(),
+                               block.font_size.points (72 * 11),
+                               1.0,
+                               dcp::Time (from.seconds(), 1000),
+                               /* XXX: hmm; this is a bit ugly (we don't know the to time yet) */
+                               dcp::Time (),
+                               h_position,
+                               h_align,
+                               v_position,
+                               v_align,
+                               dcp::Direction::LTR,
+                               escape_text(block.text),
+                               dcp::Effect::NONE,
+                               block.effect_colour.get_value_or(sub::Colour(0, 0, 0)).dcp(),
+                               /* Hack: we should use subtitle.fade_up and subtitle.fade_down here
+                                  but the times of these often don't have a frame rate associated
+                                  with them so the sub::Time won't convert them to milliseconds without
+                                  throwing an exception.  Since only DCP subs fill those in (and we don't
+                                  use libsub for DCP subs) we can cheat by just putting 0 in here.
+                               */
+                               dcp::Time (),
+                               dcp::Time (),
+                               0
+                               );
+
+                       auto string_text = StringText(
+                               dcp_subtitle,
+                               content()->outline_width(),
+                               content()->get_font(block.font.get_value_or("")),
+                               dcp::Standard::SMPTE
                                );
+                       set_forced_appearance(content(), string_text);
+                       string_texts.push_back(string_text);
                }
        }
 
-       /* Pass these subs through the other emit_plain_start so that they get their forced settings applied */
-       emit_plain_start (from, dcp_subtitles);
+       PlainStart(ContentStringText(from, string_texts));
+       maybe_set_position(from);
 }
 
 
@@ -280,9 +294,9 @@ TextDecoder::emit_stop (ContentTime to)
 
 
 void
-TextDecoder::emit_plain (ContentTimePeriod period, vector<dcp::SubtitleString> subtitles)
+TextDecoder::emit_plain (ContentTimePeriod period, vector<dcp::SubtitleString> subtitles, dcp::Standard valign_standard)
 {
-       emit_plain_start (period.from, subtitles);
+       emit_plain_start (period.from, subtitles, valign_standard);
        emit_stop (period.to);
 }
 
@@ -312,3 +326,13 @@ TextDecoder::seek ()
 {
        _position = ContentTime ();
 }
+
+
+void
+TextDecoder::maybe_set_position (dcpomatic::ContentTime position)
+{
+       if (!_position || position > *_position) {
+               _position = position;
+       }
+}
+