X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.cc;h=0d4f4babfa9db0831650529ae4ead927260dc7f3;hb=35e9a698ba3ca35fd488b3622e441956632261cf;hp=73e17e7ead91a8481763b3da63216cfdb9c62c02;hpb=17cea71c34ed6bdba67aac8614572c7511844c2a;p=dcpomatic.git diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc index 73e17e7ea..0d4f4babf 100644 --- a/src/lib/decoder.cc +++ b/src/lib/decoder.cc @@ -1,174 +1,61 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-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 . */ -/** @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" +#include "video_decoder.h" +#include "audio_decoder.h" +#include "subtitle_decoder.h" +#include +#include -using std::string; -using std::stringstream; -using std::min; -using std::pair; -using std::list; -using boost::shared_ptr; +using std::cout; using boost::optional; -/** @param f Film. - * @param o Options. - * @param j Job that we are running within, or 0 - * @param minimal true to do the bare minimum of work; just run through the content. Useful for acquiring - * accurate frame counts as quickly as possible. This generates no video or audio output. - */ -Decoder::Decoder (boost::shared_ptr f, boost::shared_ptr o, Job* j) - : _film (f) - , _opt (o) - , _job (j) - , _video_frame (0) -{ - -} - -/** 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 (); - } - - while (pass () == false) { - if (_job && _film->dcp_length()) { - _job->set_progress (float (_video_frame) / _film->length().get()); - } - } -} + optional pos; -/** Called to tell the world that some audio data is ready - * @param audio Audio data. - */ -void -Decoder::process_audio (shared_ptr audio) -{ - /* Maybe apply gain */ - if (_film->audio_gain() != 0) { - float const linear_gain = pow (10, _film->audio_gain() / 20); - for (int i = 0; i < audio->channels(); ++i) { - for (int j = 0; j < audio->frames(); ++j) { - audio->data(i)[j] *= linear_gain; - } - } + if (video && !video->ignore() && (!pos || video->position() < *pos)) { + pos = video->position(); } - Audio (audio); -} - -/** Called by subclasses to tell the world that some video data is ready. - * We do some post-processing / filtering then emit it for listeners. - * @param frame to decode; caller manages memory. - */ -void -Decoder::process_video (AVFrame* frame) -{ - shared_ptr graph; - - list >::iterator i = _filter_graphs.begin(); - while (i != _filter_graphs.end() && !(*i)->can_process (Size (frame->width, frame->height), (AVPixelFormat) frame->format)) { - ++i; + if (audio && !audio->ignore() && (!pos || audio->position() < *pos)) { + pos = audio->position(); } - if (i == _filter_graphs.end ()) { - graph.reset (new FilterGraph (_film, this, _opt->apply_crop, Size (frame->width, frame->height), (AVPixelFormat) frame->format)); - _filter_graphs.push_back (graph); - _film->log()->log (String::compose ("New graph for %1x%2, pixel format %3", frame->width, frame->height, frame->format)); - } else { - graph = *i; + if (subtitle && !subtitle->ignore() && (!pos || subtitle->position() < *pos)) { + pos = subtitle->position(); } - list > images = graph->process (frame); - - for (list >::iterator i = images.begin(); i != images.end(); ++i) { - shared_ptr sub; - if (_timed_subtitle && _timed_subtitle->displayed_at (double (video_frame()) / _film->frames_per_second())) { - sub = _timed_subtitle->subtitle (); - } - - emit_video (*i, sub); - } + return pos.get_value_or(ContentTime()); } void -Decoder::repeat_last_video () +Decoder::seek (ContentTime, bool) { - if (!_last_image) { - _last_image.reset (new CompactImage (pixel_format(), native_size())); - _last_image->make_black (); + if (audio) { + audio->seek (); } - - emit_video (_last_image, _last_subtitle); -} - -void -Decoder::emit_video (shared_ptr image, shared_ptr sub) -{ - TIMING ("Decoder emits %1", _video_frame); - Video (image, sub); - ++_video_frame; - - _last_image = image; - _last_subtitle = sub; -} - -void -Decoder::process_subtitle (shared_ptr s) -{ - _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 (subtitle) { + subtitle->seek (); } } - -void -Decoder::set_audio_stream (optional s) -{ - _audio_stream = s; -} - -void -Decoder::set_subtitle_stream (optional s) -{ - _subtitle_stream = s; -}