X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fsubtitle_decoder.cc;h=3e6ee92f1f0e6b33c89e919db8785dff2d62dc64;hb=1460bda6f80b6529e31a1a63029dc0ec5f7d0ae8;hp=d210c578fd712a16517d680b952efe7f4dfc124e;hpb=7ecfc2b34b0c50f1859e70287fd7e5bfc0c50ce4;p=dcpomatic.git diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc index d210c578f..3e6ee92f1 100644 --- a/src/lib/subtitle_decoder.cc +++ b/src/lib/subtitle_decoder.cc @@ -21,14 +21,18 @@ #include "subtitle_decoder.h" #include "subtitle_content.h" #include "util.h" +#include "log.h" +#include "compose.hpp" #include #include #include +#include #include using std::list; using std::cout; using std::string; +using std::min; using boost::shared_ptr; using boost::optional; using boost::function; @@ -36,10 +40,11 @@ using boost::function; SubtitleDecoder::SubtitleDecoder ( Decoder* parent, shared_ptr c, + shared_ptr log, function (ContentTimePeriod, bool)> image_during, function (ContentTimePeriod, bool)> text_during ) - : _parent (parent) + : DecoderPart (parent, log) , _content (c) , _image_during (image_during) , _text_during (text_during) @@ -58,27 +63,60 @@ void SubtitleDecoder::give_image (ContentTimePeriod period, shared_ptr image, dcpomatic::Rect rect) { _decoded_image.push_back (ContentImageSubtitle (period, image, rect)); + _position = period.from; } void SubtitleDecoder::give_text (ContentTimePeriod period, list s) { + /* We must escape < and > in strings, otherwise they might confuse our subtitle + renderer (which uses some HTML-esque markup to do bold/italic etc.) + */ + BOOST_FOREACH (dcp::SubtitleString& i, s) { + string t = i.text (); + boost::algorithm::replace_all (t, "<", "<"); + boost::algorithm::replace_all (t, ">", ">"); + i.set_text (t); + } + _decoded_text.push_back (ContentTextSubtitle (period, s)); + _position = period.to; } -/** @param sp Full periods of subtitles that are showing or starting during the specified period */ +/** Get the subtitles that correspond to a given list of periods. + * @param subs Subtitles. + * @param sp Periods for which to extract subtitles from subs. + */ template list -SubtitleDecoder::get (list const & subs, list const & sp, ContentTimePeriod period, bool starting, bool accurate) +SubtitleDecoder::get (list const & subs, list const & sp, ContentTimePeriod period, bool accurate) { if (sp.empty ()) { - /* Nothing in this period */ return list (); } - /* Seek if what we want is before what we have, or a more than a little bit after */ - if (subs.empty() || sp.back().to < subs.front().period().from || sp.front().from > (subs.back().period().to + ContentTime::from_seconds (1))) { - _parent->seek (sp.front().from, true); + /* Find the time of the first subtitle we don't have in subs */ + optional missing; + BOOST_FOREACH (ContentTimePeriod i, sp) { + typename list::const_iterator j = subs.begin(); + while (j != subs.end() && j->period() != i) { + ++j; + } + if (j == subs.end ()) { + missing = i.from; + break; + } + } + + /* Suggest to our parent decoder that it might want to seek if we haven't got what we're being asked for */ + if (missing) { + _log->log ( + String::compose ( + "SD suggests seek to %1 from %2", + to_string (*missing), + position() ? to_string(*position()) : "nowhere"), + LogEntry::TYPE_DEBUG_DECODE); + maybe_seek (*missing, true); } /* Now enough pass() calls will either: @@ -91,9 +129,13 @@ SubtitleDecoder::get (list const & subs, list const & sp, /* XXX: inefficient */ list out; - for (typename list::const_iterator i = subs.begin(); i != subs.end(); ++i) { - if ((starting && period.contains (i->period().from)) || (!starting && period.overlaps (i->period ()))) { - out.push_back (*i); + BOOST_FOREACH (ContentTimePeriod i, sp) { + typename list::const_iterator j = subs.begin(); + while (j != subs.end() && j->period() != i) { + ++j; + } + if (j != subs.end()) { + out.push_back (*j); } } @@ -120,17 +162,25 @@ SubtitleDecoder::get (list const & subs, list const & sp, list SubtitleDecoder::get_text (ContentTimePeriod period, bool starting, bool accurate) { - return get (_decoded_text, _text_during (period, starting), period, starting, accurate); + return get (_decoded_text, _text_during (period, starting), period, accurate); } list SubtitleDecoder::get_image (ContentTimePeriod period, bool starting, bool accurate) { - return get (_decoded_image, _image_during (period, starting), period, starting, accurate); + return get (_decoded_image, _image_during (period, starting), period, accurate); +} + +void +SubtitleDecoder::seek (ContentTime t, bool) +{ + _log->log (String::compose ("SD seek to %1", to_string(t)), LogEntry::TYPE_DEBUG_DECODE); + reset (); + _position.reset (); } void -SubtitleDecoder::seek (ContentTime, bool) +SubtitleDecoder::reset () { _decoded_text.clear (); _decoded_image.clear (); @@ -141,9 +191,26 @@ SubtitleDecoder::give_text (ContentTimePeriod period, sub::Subtitle const & subt { /* See if our next subtitle needs to be placed on screen by us */ bool needs_placement = false; + optional bottom_line; BOOST_FOREACH (sub::Line i, subtitle.lines) { if (!i.vertical_position.reference || i.vertical_position.reference.get() == sub::TOP_OF_SUBTITLE) { needs_placement = true; + DCPOMATIC_ASSERT (i.vertical_position.line); + if (!bottom_line || bottom_line.get() < i.vertical_position.line.get()) { + bottom_line = i.vertical_position.line.get(); + } + } + } + + /* Find the lowest proportional position */ + optional lowest_proportional; + BOOST_FOREACH (sub::Line i, subtitle.lines) { + if (i.vertical_position.proportional) { + if (!lowest_proportional) { + lowest_proportional = i.vertical_position.proportional; + } else { + lowest_proportional = min (lowest_proportional.get(), i.vertical_position.proportional.get()); + } } } @@ -152,7 +219,7 @@ SubtitleDecoder::give_text (ContentTimePeriod period, sub::Subtitle const & subt BOOST_FOREACH (sub::Block j, i.blocks) { if (!j.font_size.specified()) { - /* Fallback default font size if none other has been specified */ + /* Fallback default font size if no other has been specified */ j.font_size.set_points (48); } @@ -160,15 +227,24 @@ SubtitleDecoder::give_text (ContentTimePeriod period, sub::Subtitle const & subt dcp::VAlign v_align; if (needs_placement) { DCPOMATIC_ASSERT (i.vertical_position.line); - /* This 0.053 is an arbitrary value to lift the bottom sub off the bottom + /* This 1.015 is an arbitrary value to lift the bottom sub off the bottom of the screen a bit to a pleasing degree. */ - v_position = 0.053 + i.vertical_position.line.get() * 1.2 * j.font_size.proportional (72 * 11); - v_align = dcp::VALIGN_BOTTOM; + v_position = 1.015 - + (1 + bottom_line.get() - i.vertical_position.line.get()) + * 1.2 * content()->line_spacing() * content()->y_scale() * j.font_size.proportional (72 * 11); + + v_align = dcp::VALIGN_TOP; } else { DCPOMATIC_ASSERT (i.vertical_position.proportional); DCPOMATIC_ASSERT (i.vertical_position.reference); v_position = i.vertical_position.proportional.get(); + + if (lowest_proportional) { + /* Adjust line spacing */ + v_position = ((v_position - lowest_proportional.get()) * content()->line_spacing()) + lowest_proportional.get(); + } + switch (i.vertical_position.reference.get()) { case sub::TOP_OF_SCREEN: v_align = dcp::VALIGN_TOP; @@ -185,11 +261,19 @@ SubtitleDecoder::give_text (ContentTimePeriod period, sub::Subtitle const & subt } } + dcp::Effect effect = dcp::NONE; + if (content()->outline()) { + effect = dcp::BORDER; + } else if (content()->shadow()) { + effect = dcp::SHADOW; + } + out.push_back ( dcp::SubtitleString ( string(TEXT_FONT_ID), j.italic, j.bold, + j.underline, /* force the colour to whatever is configured */ content()->colour(), j.font_size.points (72 * 11), @@ -202,10 +286,10 @@ SubtitleDecoder::give_text (ContentTimePeriod period, sub::Subtitle const & subt v_align, dcp::DIRECTION_LTR, j.text, - content()->outline() ? dcp::BORDER : dcp::NONE, - content()->outline_colour(), - dcp::Time (0, 1000), - dcp::Time (0, 1000) + effect, + content()->effect_colour(), + dcp::Time (content()->fade_in().seconds(), 1000), + dcp::Time (content()->fade_out().seconds(), 1000) ) ); }