X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.cc;h=0f2bc4358008e62123e8e042a8247c142e317c71;hb=b46c35e50da6e557a02156bc094e639650b1c890;hp=8d087b6ee00c338413948d5f6b499d132a15775e;hpb=4e5a8ec686e3fda5c550cf535cb1e0037ea7ec71;p=dcpomatic.git diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc index 8d087b6ee..0f2bc4358 100644 --- a/src/lib/decoder.cc +++ b/src/lib/decoder.cc @@ -1,134 +1,103 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2018 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 . */ -/** @file src/decoder.cc - * @brief Parent class for decoders of content. - */ - -#include -#include -#include -#include "film.h" -#include "format.h" -#include "job.h" -#include "options.h" -#include "exceptions.h" -#include "image.h" -#include "util.h" -#include "log.h" #include "decoder.h" -#include "delay_line.h" -#include "subtitle.h" -#include "filter_graph.h" - -using std::string; -using std::stringstream; -using std::min; -using std::pair; -using std::list; -using boost::shared_ptr; +#include "video_decoder.h" +#include "audio_decoder.h" +#include "text_decoder.h" +#include +#include + +using std::cout; using boost::optional; +using boost::shared_ptr; +using boost::weak_ptr; +using namespace dcpomatic; -/** @param f Film. - * @param o Options. - * @param j Job that we are running within, or 0 - */ -Decoder::Decoder (boost::shared_ptr f, boost::shared_ptr o, Job* j) - : _film (f) - , _opt (o) - , _job (j) - , _video_frame (0) +Decoder::Decoder (weak_ptr film) + : _film (film) { - + } -/** Start decoding */ -void -Decoder::go () +/** @return Earliest time of content that the next pass() will emit */ +ContentTime +Decoder::position () const { - if (_job && !_film->dcp_length()) { - _job->set_progress_unknown (); - } + optional pos; + shared_ptr f = film(); - while (pass () == false) { - if (_job && _film->dcp_length()) { - _job->set_progress (float (_video_frame) / _film->length().get()); - } + if (video && !video->ignore() && (!pos || video->position(f).get_value_or(ContentTime()) < *pos)) { + pos = video->position(f); } -} -/** Called by subclasses to tell the world that some video data is ready. - * We find a subtitle then emit it for listeners. - * @param frame to decode; caller manages memory. - */ -void -Decoder::emit_video (shared_ptr image) -{ - shared_ptr sub; - if (_timed_subtitle && _timed_subtitle->displayed_at (double (video_frame()) / _film->frames_per_second())) { - sub = _timed_subtitle->subtitle (); + if (audio && !audio->ignore() && (!pos || audio->position(f).get_value_or(ContentTime()) < *pos)) { + pos = audio->position(f); } - signal_video (image, sub); -} - -void -Decoder::repeat_last_video () -{ - if (!_last_image) { - _last_image.reset (new CompactImage (pixel_format(), native_size())); - _last_image->make_black (); + /* Only decide position based on subtitle sources if there is nothing else + to go on. Otherwise we can have problems with muxed sources which have + (for example) video, audio and a subtitle. If the subtitle data runs out + before the video/audio the position() call will return the position of the + end of the subs. This causes this file to be pass()ed in favour of others, + which can cause bugs like #1581. + */ + if (!pos) { + BOOST_FOREACH (shared_ptr i, text) { + if (!i->ignore() && (!pos || i->position(f) < *pos)) { + pos = i->position(f); + } + } } - signal_video (_last_image, _last_subtitle); -} - -void -Decoder::signal_video (shared_ptr image, shared_ptr sub) -{ - TIMING ("Decoder emits %1", _video_frame); - Video (image, sub); - ++_video_frame; - - _last_image = image; - _last_subtitle = sub; + return pos.get_value_or(ContentTime()); } void -Decoder::emit_subtitle (shared_ptr s) +Decoder::seek (ContentTime, bool) { - _timed_subtitle = s; - - if (_timed_subtitle && _opt->apply_crop) { - Position const p = _timed_subtitle->subtitle()->position (); - _timed_subtitle->subtitle()->set_position (Position (p.x - _film->crop().left, p.y - _film->crop().top)); + if (video) { + video->seek (); + } + if (audio) { + audio->seek (); + } + BOOST_FOREACH (shared_ptr i, text) { + i->seek (); } } -void -Decoder::set_audio_stream (optional s) +shared_ptr +Decoder::only_text () const { - _audio_stream = s; + DCPOMATIC_ASSERT (text.size() < 2); + if (text.empty ()) { + return shared_ptr (); + } + return text.front (); } -void -Decoder::set_subtitle_stream (optional s) +shared_ptr +Decoder::film () const { - _subtitle_stream = s; + shared_ptr f = _film.lock (); + DCPOMATIC_ASSERT (f); + return f; }