X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftext_decoder.cc;h=930262a74da321fa22ac2df75bd2127c46592608;hb=182b9d2e2feb6545592868606aaf0f0146095481;hp=c6563a260fe238656a2c65889c13f8cdb06d1298;hpb=a7bd8d64d37ac0fd751226c0fba98e219dea9b0d;p=dcpomatic.git diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc index c6563a260..930262a74 100644 --- 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 content, - ContentTime first + shared_ptr 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()); } @@ -81,42 +79,57 @@ escape_text (string text) } +static void -TextDecoder::emit_plain_start (ContentTime from, vector subtitles) +set_forced_appearance(shared_ptr content, StringText& subtitle) { - for (auto& subtitle: subtitles) { - subtitle.set_text(escape_text(subtitle.text())); + if (content->colour()) { + subtitle.set_colour(*content->colour()); + } + if (content->effect_colour()) { + subtitle.set_effect_colour(*content->effect_colour()); + } + if (content->effect()) { + subtitle.set_effect(*content->effect()); + } + if (content->fade_in()) { + subtitle.set_fade_up_time(dcp::Time(content->fade_in()->seconds(), 1000)); + } + if (content->fade_out()) { + subtitle.set_fade_down_time (dcp::Time(content->fade_out()->seconds(), 1000)); + } +} - /* Set any forced appearance */ - if (content()->colour()) { - subtitle.set_colour(*content()->colour()); - } - if (content()->effect_colour()) { - subtitle.set_effect_colour(*content()->effect_colour()); - } - if (content()->effect()) { - subtitle.set_effect(*content()->effect()); - } - if (content()->fade_in()) { - subtitle.set_fade_up_time(dcp::Time(content()->fade_in()->seconds(), 1000)); - } - if (content()->fade_out()) { - subtitle.set_fade_down_time (dcp::Time(content()->fade_out()->seconds(), 1000)); - } + +void +TextDecoder::emit_plain_start (ContentTime from, vector subtitles, dcp::Standard valign_standard) +{ + vector string_texts; + + for (auto& subtitle: subtitles) { + auto string_text = StringText( + subtitle, + content()->outline_width(), + subtitle.font() ? content()->get_font(*subtitle.font()) : shared_ptr(), + 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); } void -TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle) +TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & sub_subtitle) { /* See if our next subtitle needs to be vertically placed on screen by us */ bool needs_placement = false; optional bottom_line; - for (auto line: subtitle.lines) { + for (auto line: sub_subtitle.lines) { if (!line.vertical_position.reference || (line.vertical_position.line && !line.vertical_position.lines) || line.vertical_position.reference.get() == sub::TOP_OF_SUBTITLE) { needs_placement = true; if (!bottom_line || bottom_line.get() < line.vertical_position.line.get()) { @@ -127,7 +140,7 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle) /* Find the lowest proportional position */ optional lowest_proportional; - for (auto line: subtitle.lines) { + for (auto line: sub_subtitle.lines) { if (line.vertical_position.proportional) { if (!lowest_proportional) { lowest_proportional = line.vertical_position.proportional; @@ -137,8 +150,8 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle) } } - vector out; - for (auto line: subtitle.lines) { + vector string_texts; + for (auto line: sub_subtitle.lines) { for (auto block: line.blocks) { if (!block.font_size.specified()) { @@ -227,42 +240,49 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle) content by the other emit_plain_start() above. */ - out.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(), + 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, out); + PlainStart(ContentStringText(from, string_texts)); + maybe_set_position(from); } @@ -274,9 +294,9 @@ TextDecoder::emit_stop (ContentTime to) void -TextDecoder::emit_plain (ContentTimePeriod period, vector subtitles) +TextDecoder::emit_plain (ContentTimePeriod period, vector subtitles, dcp::Standard valign_standard) { - emit_plain_start (period.from, subtitles); + emit_plain_start (period.from, subtitles, valign_standard); emit_stop (period.to); } @@ -306,3 +326,13 @@ TextDecoder::seek () { _position = ContentTime (); } + + +void +TextDecoder::maybe_set_position (dcpomatic::ContentTime position) +{ + if (!_position || position > *_position) { + _position = position; + } +} +