/*
- Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
- 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 <http://www.gnu.org/licenses/>.
*/
#include "subtitle_content.h"
#include <boost/shared_ptr.hpp>
#include <boost/foreach.hpp>
+#include <iostream>
using std::list;
using std::cout;
using boost::shared_ptr;
using boost::optional;
-
-SubtitleDecoder::SubtitleDecoder (shared_ptr<const SubtitleContent> c)
- : _subtitle_content (c)
+using boost::function;
+
+SubtitleDecoder::SubtitleDecoder (
+ Decoder* parent,
+ shared_ptr<const SubtitleContent> c,
+ function<list<ContentTimePeriod> (ContentTimePeriod, bool)> image_during,
+ function<list<ContentTimePeriod> (ContentTimePeriod, bool)> text_during
+ )
+ : _parent (parent)
+ , _content (c)
+ , _image_during (image_during)
+ , _text_during (text_during)
{
}
* of the video frame)
*/
void
-SubtitleDecoder::image_subtitle (ContentTimePeriod period, shared_ptr<Image> image, dcpomatic::Rect<double> rect)
+SubtitleDecoder::give_image (ContentTimePeriod period, shared_ptr<Image> image, dcpomatic::Rect<double> rect)
{
- _decoded_image_subtitles.push_back (ContentImageSubtitle (period, image, rect));
+ _decoded_image.push_back (ContentImageSubtitle (period, image, rect));
}
void
-SubtitleDecoder::text_subtitle (ContentTimePeriod period, list<dcp::SubtitleString> s)
+SubtitleDecoder::give_text (ContentTimePeriod period, list<dcp::SubtitleString> s)
{
- _decoded_text_subtitles.push_back (ContentTextSubtitle (period, s));
+ _decoded_text.push_back (ContentTextSubtitle (period, s));
}
/** @param sp Full periods of subtitles that are showing or starting during the specified period */
template <class T>
list<T>
-SubtitleDecoder::get (list<T> const & subs, list<ContentTimePeriod> const & sp, ContentTimePeriod period, bool starting)
+SubtitleDecoder::get (list<T> const & subs, list<ContentTimePeriod> const & sp, ContentTimePeriod period, bool starting, bool accurate)
{
if (sp.empty ()) {
/* Nothing in this period */
return list<T> ();
}
- /* Seek if what we want is before what we have, or a more than a little bit after.
- Be careful with the length of this `little bit'; consider the case where the last
- subs were just less than this little bit B ago. Then we will not seek, but instead
- pass() for nearly B seconds; if we are a FFmpegDecoder then this will generate B's
- worth of video which will stack up. If B + the pre-roll is bigger than the maximum
- number of frames that the VideoDecoder will keep then we will get an assertion
- failure in VideoDecoder.
- */
+ /* 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);
+ _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 */
/* Discard anything in _decoded_image_subtitles that is outside 5 seconds either side of period */
- list<ContentImageSubtitle>::iterator i = _decoded_image_subtitles.begin();
- while (i != _decoded_image_subtitles.end()) {
+ list<ContentImageSubtitle>::iterator i = _decoded_image.begin();
+ while (i != _decoded_image.end()) {
list<ContentImageSubtitle>::iterator tmp = i;
++tmp;
i->period().to < (period.from - ContentTime::from_seconds (5)) ||
i->period().from > (period.to + ContentTime::from_seconds (5))
) {
- _decoded_image_subtitles.erase (i);
+ _decoded_image.erase (i);
}
i = tmp;
}
list<ContentTextSubtitle>
-SubtitleDecoder::get_text_subtitles (ContentTimePeriod period, bool starting)
+SubtitleDecoder::get_text (ContentTimePeriod period, bool starting, bool accurate)
{
- return get<ContentTextSubtitle> (_decoded_text_subtitles, text_subtitles_during (period, starting), period, starting);
+ return get<ContentTextSubtitle> (_decoded_text, _text_during (period, starting), period, starting, accurate);
}
list<ContentImageSubtitle>
-SubtitleDecoder::get_image_subtitles (ContentTimePeriod period, bool starting)
+SubtitleDecoder::get_image (ContentTimePeriod period, bool starting, bool accurate)
{
- return get<ContentImageSubtitle> (_decoded_image_subtitles, image_subtitles_during (period, starting), period, starting);
+ return get<ContentImageSubtitle> (_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 ();
}