X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_decoder.cc;h=766c7ed87738814c3185202142c987252fb2ace4;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=e1485e221d70807109e3803b0493c9d8524fe974;hpb=40b654453c2ce0b266f43c36f1b9a5d1705f983c;p=dcpomatic.git diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc index e1485e221..766c7ed87 100644 --- a/src/lib/subtitle_decoder.cc +++ b/src/lib/subtitle_decoder.cc @@ -1,77 +1,92 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + 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 #include "subtitle_decoder.h" #include "subtitle_content.h" +#include +#include +#include using std::list; using std::cout; using boost::shared_ptr; using boost::optional; - -SubtitleDecoder::SubtitleDecoder (shared_ptr c) - : _subtitle_content (c) +using boost::function; + +SubtitleDecoder::SubtitleDecoder ( + Decoder* parent, + shared_ptr c, + function (ContentTimePeriod, bool)> image_during, + function (ContentTimePeriod, bool)> text_during + ) + : _parent (parent) + , _content (c) + , _image_during (image_during) + , _text_during (text_during) { } /** Called by subclasses when an image subtitle is ready. - * Image may be 0 to say that there is no current subtitle. + * @param period Period of the subtitle. + * @param image Subtitle image. + * @param rect Area expressed as a fraction of the video frame that this subtitle + * is for (e.g. a width of 0.5 means the width of the subtitle is half the width + * of the video frame) */ void -SubtitleDecoder::image_subtitle (ContentTimePeriod period, shared_ptr image, dcpomatic::Rect rect) +SubtitleDecoder::give_image (ContentTimePeriod period, shared_ptr image, dcpomatic::Rect rect) { - _decoded_image_subtitles.push_back (ContentImageSubtitle (period, image, rect)); + _decoded_image.push_back (ContentImageSubtitle (period, image, rect)); } void -SubtitleDecoder::text_subtitle (list s) +SubtitleDecoder::give_text (ContentTimePeriod period, list s) { - _decoded_text_subtitles.push_back (ContentTextSubtitle (s)); + _decoded_text.push_back (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, ContentTimePeriod period, bool starting) +SubtitleDecoder::get (list const & subs, list const & sp, ContentTimePeriod period, bool starting, bool accurate) { - /* Get the full periods of the subtitles that are showing or starting during the specified period */ - list sp = subtitles_during (period, starting); if (sp.empty ()) { /* Nothing in this period */ return list (); } - /* Seek if what we want is before what we have, or more than a reasonable amount after */ - if (subs.empty() || sp.back().to < subs.front().period().from || sp.front().from > (subs.back().period().to + ContentTime::from_seconds (5))) { - seek (sp.front().from, true); + /* 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); } /* Now enough pass() calls will either: * (a) give us what we want, or * (b) hit the end of the decoder. */ - while (!pass() && (subs.empty() || (subs.back().period().to < sp.back().to))) {} + 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 ()))) { @@ -79,24 +94,41 @@ SubtitleDecoder::get (list const & subs, ContentTimePeriod period, bool start } } + /* 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); + } + + i = tmp; + } + return out; } list -SubtitleDecoder::get_text_subtitles (ContentTimePeriod period, bool starting) +SubtitleDecoder::get_text (ContentTimePeriod period, bool starting, bool accurate) { - return get (_decoded_text_subtitles, period, starting); + return get (_decoded_text, _text_during (period, starting), period, starting, accurate); } list -SubtitleDecoder::get_image_subtitles (ContentTimePeriod period, bool starting) +SubtitleDecoder::get_image (ContentTimePeriod period, bool starting, bool accurate) { - return get (_decoded_image_subtitles, period, starting); + return get (_decoded_image, _image_during (period, starting), period, starting, accurate); } void SubtitleDecoder::seek (ContentTime, bool) { - _decoded_text_subtitles.clear (); - _decoded_image_subtitles.clear (); + _decoded_text.clear (); + _decoded_image.clear (); }