X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.cc;h=3625e074fba0460fc63729a00bc30c446f7d769b;hb=14cccb179fff7bbbf422e13f9d2e3264239c93c7;hp=8bb7f3700ec6a54c51f54ff02e5a13b16ee5606c;hpb=e8819ad7580f25eea7ca3c59cf0a3979d76a6b44;p=dcpomatic.git diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index 8bb7f3700..3625e074f 100644 --- a/src/lib/video_decoder.cc +++ b/src/lib/video_decoder.cc @@ -1,85 +1,106 @@ -/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */ - /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington + + This file is part of DCP-o-matic. - This program is free software; you can redistribute it and/or modify + 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 "video_decoder.h" -#include "subtitle.h" -#include "film.h" #include "image.h" +#include "raw_image_proxy.h" +#include "film.h" +#include "log.h" +#include "compose.hpp" +#include +#include #include "i18n.h" using std::cout; +using std::list; +using std::max; +using std::back_inserter; using boost::shared_ptr; +using boost::optional; -VideoDecoder::VideoDecoder (shared_ptr f, shared_ptr c) - : Decoder (f) - , _next_video (0) - , _video_content (c) - , _frame_rate_conversion (c->video_frame_rate(), f->dcp_frame_rate()) - , _odd (false) +VideoDecoder::VideoDecoder (Decoder* parent, shared_ptr c, shared_ptr log) + : DecoderPart (parent, log) + , _content (c) { } -/** Called by subclasses when some video is ready. - * @param image frame to emit. - * @param same true if this frame is the same as the last one passed to this call. - * @param t Time of the frame within the source. +/** Called by decoder classes when they have a video frame ready. + * @param frame Frame index within the content; this does not take into account 3D + * so for 3D_ALTERNATE this value goes: + * 0: frame 0 left + * 1: frame 0 right + * 2: frame 1 left + * 3: frame 1 right + * and so on. */ void -VideoDecoder::video (shared_ptr image, bool same, Time t) +VideoDecoder::emit (shared_ptr image, Frame frame) { - if (_frame_rate_conversion.skip && _odd) { - _odd = !_odd; + if (ignore ()) { return; } - shared_ptr sub; - if (_timed_subtitle && _timed_subtitle->displayed_at (t)) { - sub = _timed_subtitle->subtitle (); + switch (_content->video->frame_type ()) { + case VIDEO_FRAME_TYPE_2D: + Data (ContentVideo (image, frame, EYES_BOTH, PART_WHOLE)); + break; + case VIDEO_FRAME_TYPE_3D: + { + /* We receive the same frame index twice for 3D; hence we know which + frame this one is. + */ + bool const same = (_last_emitted && _last_emitted.get() == frame); + Data (ContentVideo (image, frame, same ? EYES_RIGHT : EYES_LEFT, PART_WHOLE)); + _last_emitted = frame; + break; } - - Video (image, same, sub, t); - - if (_frame_rate_conversion.repeat) { - Video (image, true, sub, t + _film->video_frames_to_time (1)); - _next_video = t + _film->video_frames_to_time (2); - } else { - _next_video = t + _film->video_frames_to_time (1); + case VIDEO_FRAME_TYPE_3D_ALTERNATE: + Data (ContentVideo (image, frame / 2, (frame % 2) ? EYES_RIGHT : EYES_LEFT, PART_WHOLE)); + frame /= 2; + break; + case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT: + Data (ContentVideo (image, frame, EYES_LEFT, PART_LEFT_HALF)); + Data (ContentVideo (image, frame, EYES_RIGHT, PART_RIGHT_HALF)); + break; + case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM: + Data (ContentVideo (image, frame, EYES_LEFT, PART_TOP_HALF)); + Data (ContentVideo (image, frame, EYES_RIGHT, PART_BOTTOM_HALF)); + break; + case VIDEO_FRAME_TYPE_3D_LEFT: + Data (ContentVideo (image, frame, EYES_LEFT, PART_WHOLE)); + break; + case VIDEO_FRAME_TYPE_3D_RIGHT: + Data (ContentVideo (image, frame, EYES_RIGHT, PART_WHOLE)); + break; + default: + DCPOMATIC_ASSERT (false); } - _odd = !_odd; + _position = ContentTime::from_frames (frame, _content->active_video_frame_rate ()); } -/** Called by subclasses when a subtitle is ready. - * s may be 0 to say that there is no current subtitle. - * @param s New current subtitle, or 0. - */ void -VideoDecoder::subtitle (shared_ptr s) +VideoDecoder::seek () { - _timed_subtitle = s; - - if (_timed_subtitle) { - Position const p = _timed_subtitle->subtitle()->position (); - _timed_subtitle->subtitle()->set_position (Position (p.x - _video_content->crop().left, p.y - _video_content->crop().top)); - } + _position = ContentTime(); + _last_emitted.reset (); }