X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.cc;h=47385cc614c8c1387e756b254edbb85f6c78b333;hb=854f2e5bbb7ffb9758b823af87034033033f3cb8;hp=891720f6b85ecb04a4185e92ac49821fd228bf12;hpb=0d3f5aae5b99832b7c5d55f32f5bccb365caa3fd;p=dcpomatic.git diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index 891720f6b..6a7a62b74 100644 --- a/src/lib/video_decoder.cc +++ b/src/lib/video_decoder.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,105 +18,120 @@ */ #include "video_decoder.h" -#include "subtitle.h" -#include "film.h" #include "image.h" -#include "log.h" -#include "options.h" -#include "job.h" +#include "content_video.h" #include "i18n.h" +using std::cout; +using std::list; using boost::shared_ptr; using boost::optional; -VideoDecoder::VideoDecoder (shared_ptr f, DecodeOptions o) - : Decoder (f, o) - , _video_frame (0) - , _last_source_time (0) +VideoDecoder::VideoDecoder (shared_ptr c) + : _video_content (c) { } -/** Called by subclasses to tell the world that some video data is ready. - * We find a subtitle then emit it for listeners. - * @param image frame to emit. - * @param t Time of the frame within the source, in seconds. - */ -void -VideoDecoder::emit_video (shared_ptr image, double t) +optional +VideoDecoder::decoded_video (VideoFrame frame) { - shared_ptr sub; - if (_timed_subtitle && _timed_subtitle->displayed_at (t)) { - sub = _timed_subtitle->subtitle (); + for (list::const_iterator i = _decoded_video.begin(); i != _decoded_video.end(); ++i) { + if (i->frame == frame) { + return *i; + } } - signal_video (image, false, sub); - _last_source_time = t; + return optional (); } -/** Called by subclasses to repeat the last video frame that we - * passed to emit_video(). If emit_video hasn't yet been called, - * we will generate a black frame. - */ -void -VideoDecoder::repeat_last_video () +optional +VideoDecoder::get_video (VideoFrame frame, bool accurate) { - if (!_last_image) { - _last_image.reset (new SimpleImage (pixel_format(), native_size(), true)); - _last_image->make_black (); + if (_decoded_video.empty() || (frame < _decoded_video.front().frame || frame > (_decoded_video.back().frame + 1))) { + /* Either we have no decoded data, or what we do have is a long way from what we want: seek */ + seek (ContentTime::from_frames (frame, _video_content->video_frame_rate()), accurate); } - signal_video (_last_image, true, _last_subtitle); -} + optional dec; + + /* Now enough pass() calls will either: + * (a) give us what we want, or + * (b) hit the end of the decoder. + */ + if (accurate) { + /* We are being accurate, so we want the right frame */ + while (!decoded_video (frame) && !pass ()) {} + dec = decoded_video (frame); + } else { + /* Any frame will do: use the first one that comes out of pass() */ + while (_decoded_video.empty() && !pass ()) {} + if (!_decoded_video.empty ()) { + dec = _decoded_video.front (); + } + } -/** Emit our signal to say that some video data is ready. - * @param image Video frame. - * @param same true if `image' is the same as the last one we emitted. - * @param sub Subtitle for this frame, or 0. - */ -void -VideoDecoder::signal_video (shared_ptr image, bool same, shared_ptr sub) -{ - TIMING (N_("Decoder emits %1"), _video_frame); - Video (image, same, sub); - ++_video_frame; + /* Clean up decoded_video */ + while (!_decoded_video.empty() && _decoded_video.front().frame < (frame - 1)) { + _decoded_video.pop_front (); + } - _last_image = image; - _last_subtitle = sub; + return dec; } -/** Set up the current subtitle. This will be put onto frames that - * fit within its time specification. s may be 0 to say that there - * is no current subtitle. - * @param s New current subtitle, or 0. - */ + +/** Called by subclasses when they have a video frame ready */ void -VideoDecoder::emit_subtitle (shared_ptr s) +VideoDecoder::video (shared_ptr image, VideoFrame frame) { - _timed_subtitle = s; + /* Fill in gaps */ + /* XXX: 3D */ + while (!_decoded_video.empty () && (_decoded_video.back().frame + 1) < frame) { + _decoded_video.push_back ( + ContentVideo ( + _decoded_video.back().image, + _decoded_video.back().eyes, + _decoded_video.back().frame + 1 + ) + ); + } - if (_timed_subtitle) { - Position const p = _timed_subtitle->subtitle()->position (); - _timed_subtitle->subtitle()->set_position (Position (p.x - _film->crop().left, p.y - _film->crop().top)); + switch (_video_content->video_frame_type ()) { + case VIDEO_FRAME_TYPE_2D: + _decoded_video.push_back (ContentVideo (image, EYES_BOTH, frame)); + break; + case VIDEO_FRAME_TYPE_3D_ALTERNATE: + _decoded_video.push_back (ContentVideo (image, (frame % 2) ? EYES_RIGHT : EYES_LEFT, frame)); + break; + case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT: + { + int const half = image->size().width / 2; + _decoded_video.push_back (ContentVideo (image->crop (Crop (0, half, 0, 0), true), EYES_LEFT, frame)); + _decoded_video.push_back (ContentVideo (image->crop (Crop (half, 0, 0, 0), true), EYES_RIGHT, frame)); + break; + } + case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM: + { + int const half = image->size().height / 2; + _decoded_video.push_back (ContentVideo (image->crop (Crop (0, 0, 0, half), true), EYES_LEFT, frame)); + _decoded_video.push_back (ContentVideo (image->crop (Crop (0, 0, half, 0), true), EYES_RIGHT, frame)); + break; + } + case VIDEO_FRAME_TYPE_3D_LEFT: + _decoded_video.push_back (ContentVideo (image, EYES_LEFT, frame)); + break; + case VIDEO_FRAME_TYPE_3D_RIGHT: + _decoded_video.push_back (ContentVideo (image, EYES_RIGHT, frame)); + break; + default: + assert (false); } } -/** Set which stream of subtitles we should use from our source. - * @param s Stream to use. - */ void -VideoDecoder::set_subtitle_stream (shared_ptr s) +VideoDecoder::seek (ContentTime, bool) { - _subtitle_stream = s; + _decoded_video.clear (); } -void -VideoDecoder::set_progress (Job* j) const -{ - assert (j); - - if (_film->length()) { - j->set_progress (float (_video_frame) / _film->length().get()); - } -}