X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_decoder.cc;h=c437ec9457b839c8095c444cc1bca828639d4a77;hb=de2af791bdfdcd653752cba970e59efc7bf810c7;hp=f182c53e559e4e01c7cba8d3749145bbaa0ba3c2;hpb=0758d834992f0adb8aa8d4d9908a64ce8708f05c;p=dcpomatic.git diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc index f182c53e5..c437ec945 100644 --- a/src/lib/subtitle_decoder.cc +++ b/src/lib/subtitle_decoder.cc @@ -1,30 +1,38 @@ /* Copyright (C) 2013-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #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; @@ -32,13 +40,10 @@ using boost::function; SubtitleDecoder::SubtitleDecoder ( Decoder* parent, shared_ptr c, - function (ContentTimePeriod, bool)> image_during, - function (ContentTimePeriod, bool)> text_during + shared_ptr log ) - : _parent (parent) + : DecoderPart (parent, log) , _content (c) - , _image_during (image_during) - , _text_during (text_during) { } @@ -51,83 +56,135 @@ SubtitleDecoder::SubtitleDecoder ( * of the video frame) */ void -SubtitleDecoder::give_image (ContentTimePeriod period, shared_ptr image, dcpomatic::Rect rect) +SubtitleDecoder::emit_image (ContentTimePeriod period, shared_ptr image, dcpomatic::Rect rect) { - _decoded_image.push_back (ContentImageSubtitle (period, image, rect)); + ImageData (ContentImageSubtitle (period, image, rect)); } void -SubtitleDecoder::give_text (ContentTimePeriod period, list s) +SubtitleDecoder::emit_text (ContentTimePeriod period, list s) { - _decoded_text.push_back (ContentTextSubtitle (period, 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); + } + + TextData (ContentTextSubtitle (period, s)); } -/** @param sp Full periods of subtitles that are showing or starting during the specified period */ -template -list -SubtitleDecoder::get (list const & subs, list const & sp, ContentTimePeriod period, bool starting, bool accurate) +void +SubtitleDecoder::emit_text (ContentTimePeriod period, sub::Subtitle const & subtitle) { - 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))) { - seek (sp.front().from, true); + /* 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(); + } + } } - /* Now enough pass() calls will either: - * (a) give us what we want, or - * (b) hit the end of the decoder. - */ - while (!_parent->pass(Decoder::PASS_REASON_SUBTITLE, accurate) && (subs.empty() || (subs.back().period().to < sp.back().to))) {} - - /* Now look for what we wanted in the data we have collected */ - /* 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); + /* 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()); + } } } - /* Discard anything in _decoded_image_subtitles that is outside 5 seconds either side of period */ - - list::iterator i = _decoded_image.begin(); - while (i != _decoded_image.end()) { - list::iterator tmp = i; - ++tmp; - - if ( - i->period().to < (period.from - ContentTime::from_seconds (5)) || - i->period().from > (period.to + ContentTime::from_seconds (5)) - ) { - _decoded_image.erase (i); + list out; + BOOST_FOREACH (sub::Line i, subtitle.lines) { + BOOST_FOREACH (sub::Block j, i.blocks) { + + if (!j.font_size.specified()) { + /* Fallback default font size if no other has been specified */ + j.font_size.set_points (48); + } + + float v_position; + dcp::VAlign v_align; + if (needs_placement) { + DCPOMATIC_ASSERT (i.vertical_position.line); + /* 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 = 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; + break; + case sub::CENTRE_OF_SCREEN: + v_align = dcp::VALIGN_CENTER; + break; + case sub::BOTTOM_OF_SCREEN: + v_align = dcp::VALIGN_BOTTOM; + break; + default: + v_align = dcp::VALIGN_TOP; + break; + } + } + + 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), + 1.0, + dcp::Time (period.from.seconds(), 1000), + dcp::Time (period.to.seconds(), 1000), + 0, + dcp::HALIGN_CENTER, + v_position, + v_align, + dcp::DIRECTION_LTR, + j.text, + effect, + content()->effect_colour(), + dcp::Time (content()->fade_in().seconds(), 1000), + dcp::Time (content()->fade_out().seconds(), 1000) + ) + ); } - - i = tmp; } - return out; -} - -list -SubtitleDecoder::get_text (ContentTimePeriod period, bool starting, bool accurate) -{ - return get (_decoded_text, _text_during (period, starting), period, starting, accurate); -} - -list -SubtitleDecoder::get_image (ContentTimePeriod period, bool starting, bool accurate) -{ - return get (_decoded_image, _image_during (period, starting), period, starting, accurate); -} - -void -SubtitleDecoder::seek (ContentTime, bool) -{ - _decoded_text.clear (); - _decoded_image.clear (); + emit_text (period, out); }