Bump libsub for libdcp dependency removal.

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

diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc
index e3b7d995879b7f5dcc61b919b68db5fc6f86e567..6fd036ae191ad193b5f1813e8eba8c5219e4949f 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,21 +61,7 @@ void
 TextDecoder::emit_bitmap_start (ContentBitmapText const& bitmap)
 {
        BitmapStart (bitmap);
-       _position = bitmap.from();
-}
-
-
-static
-string
-escape_text (string text)
-{
-       /* We must escape some things, otherwise they might confuse our subtitle
-          renderer (which uses entities and some HTML-esque markup to do bold/italic etc.)
-       */
-       boost::algorithm::replace_all(text, "&", "&amp;");
-       boost::algorithm::replace_all(text, "<", "&lt;");
-       boost::algorithm::replace_all(text, ">", "&gt;");
-       return text;
+       maybe_set_position(bitmap.from());
 }
 
 
@@ -104,19 +88,24 @@ set_forced_appearance(shared_ptr<const TextContent> content, StringText& subtitl
 
 
 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) {
-               auto string_text = StringText(subtitle, content()->outline_width(), subtitle.font() ? content()->get_font(*subtitle.font()) : shared_ptr<Font>());
-               string_text.set_text(escape_text(string_text.text()));
+               auto string_text = StringText(
+                       subtitle,
+                       content()->outline_width(),
+                       content()->get_font(subtitle.font().get_value_or("")),
+                       valign_standard
+                       );
+               string_text.set_text(string_text.text());
                set_forced_appearance(content(), string_text);
                string_texts.push_back(string_text);
        }
 
        PlainStart(ContentStringText(from, string_texts));
-       _position = from;
+       maybe_set_position(from);
 }
 
 
@@ -164,10 +153,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;
@@ -237,12 +226,16 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & sub_subti
                           content by the other emit_plain_start() above.
                        */
 
+                       auto dcp_colour = [](sub::Colour const& c) {
+                               return dcp::Colour(lrintf(c.r * 255), lrintf(c.g * 255), lrintf(c.b * 255));
+                               };
+
                        auto dcp_subtitle = dcp::SubtitleString(
                                optional<string>(),
                                block.italic,
                                block.bold,
                                block.underline,
-                               block.colour.dcp(),
+                               dcp_colour(block.colour),
                                block.font_size.points (72 * 11),
                                1.0,
                                dcp::Time (from.seconds(), 1000),
@@ -252,10 +245,11 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & sub_subti
                                h_align,
                                v_position,
                                v_align,
+                               0,
                                dcp::Direction::LTR,
-                               escape_text(block.text),
+                               block.text,
                                dcp::Effect::NONE,
-                               block.effect_colour.get_value_or(sub::Colour(0, 0, 0)).dcp(),
+                               dcp_colour(block.effect_colour.get_value_or(sub::Colour(0, 0, 0))),
                                /* 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
@@ -267,14 +261,19 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & sub_subti
                                0
                                );
 
-                       auto string_text = StringText(dcp_subtitle, content()->outline_width(), content()->get_font(block.font.get_value_or("")));
+                       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);
                }
        }
 
        PlainStart(ContentStringText(from, string_texts));
-       _position = from;
+       maybe_set_position(from);
 }
 
 
@@ -286,9 +285,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);
 }
 
@@ -318,3 +317,13 @@ TextDecoder::seek ()
 {
        _position = ContentTime ();
 }
+
+
+void
+TextDecoder::maybe_set_position (dcpomatic::ContentTime position)
+{
+       if (!_position || position > *_position) {
+               _position = position;
+       }
+}
+