X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_decoder.cc;h=307226da6b184a25e12585dd14b2d83c4880c0a2;hb=58b5c57c9a4767c786a1428f243c60ff52c82c26;hp=2da4b7a3438ded046dd83d886bc7484206550596;hpb=49a1e2a600bd7b9d2d4a926256378e6134704a1a;p=dcpomatic.git diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc index 2da4b7a34..307226da6 100644 --- a/src/lib/subtitle_decoder.cc +++ b/src/lib/subtitle_decoder.cc @@ -1,30 +1,36 @@ /* 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 #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; @@ -59,16 +65,28 @@ SubtitleDecoder::give_image (ContentTimePeriod period, shared_ptr image, 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)); } -/** @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 (); } @@ -87,9 +105,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); } } @@ -116,18 +138,136 @@ 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, bool) +{ + reset (); +} + +void +SubtitleDecoder::reset () { _decoded_text.clear (); _decoded_image.clear (); } + +void +SubtitleDecoder::give_text (ContentTimePeriod period, sub::Subtitle const & subtitle) +{ + /* 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()); + } + } + } + + 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) + ) + ); + } + } + + give_text (period, out); +}