X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.cc;h=5dd078553659b21d3c09bcf8a030ea77e73ad783;hb=2cf3da72a017eebf741dfb9a5ec158df94a4e7b7;hp=cba21d280aae20a51fff025cb470fde6d3f5cb10;hpb=f385ef03e5ea27519a31c0839447735a7fba0602;p=dcpomatic.git diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index cba21d280..5dd078553 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,97 +18,163 @@ */ #include "video_decoder.h" -#include "subtitle.h" -#include "film.h" #include "image.h" -#include "ratio.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, shared_ptr c) - : Decoder (f) - , _next_video (0) +VideoDecoder::VideoDecoder (shared_ptr c) +#ifdef DCPOMATIC_DEBUG + : test_gaps (0) , _video_content (c) - , _frame_rate_conversion (c->video_frame_rate(), f->dcp_video_frame_rate()) - , _odd (false) +#else + : _video_content (c) +#endif + , _same (false) { } -/** 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. - */ -void -VideoDecoder::video (shared_ptr image, bool same, Time t) +list +VideoDecoder::decoded_video (VideoFrame frame) { - if (_frame_rate_conversion.skip && _odd) { - _odd = !_odd; - return; - } - - image->crop (_video_content->crop(), true); - - shared_ptr film = _film.lock (); - assert (film); - - libdcp::Size const container_size = film->container()->size (film->full_frame ()); - libdcp::Size const image_size = _video_content->ratio()->size (container_size); + list output; - shared_ptr out = image->scale_and_convert_to_rgb (image_size, film->scaler(), true); - - 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) { + output.push_back (*i); + } } - if (sub) { - Rect const tx = subtitle_transformed_area ( - float (image_size.width) / video_size().width, - float (image_size.height) / video_size().height, - sub->area(), film->subtitle_offset(), film->subtitle_scale() - ); + return output; +} - shared_ptr im = sub->image()->scale (tx.size(), film->scaler(), true); - out->alpha_blend (im, tx.position()); +/** Get all frames which exist in the content at a given frame index. + * @param frame Frame index. + * @param accurate true to try hard to return frames at the precise time that was requested, otherwise frames nearby may be returned. + * @return Frames; there may be none (if there is no video there), 1 for 2D or 2 for 3D. + */ +list +VideoDecoder::get_video (VideoFrame frame, bool accurate) +{ + /* At this stage, if we have get_video()ed before, _decoded_video will contain the last frame that this + method returned (and possibly a few more). If the requested frame is not in _decoded_video and it is not the next + one after the end of _decoded_video we need to seek. + */ + + if (_decoded_video.empty() || frame < _decoded_video.front().frame || frame > (_decoded_video.back().frame + 1)) { + seek (ContentTime::from_frames (frame, _video_content->video_frame_rate()), accurate); } - if (image_size != container_size) { - assert (image_size.width <= container_size.width); - assert (image_size.height <= container_size.height); - shared_ptr im (new SimpleImage (PIX_FMT_RGB24, container_size, true)); - im->make_black (); - im->copy (out, Position ((container_size.width - image_size.width) / 2, (container_size.height - image_size.height) / 2)); - out = im; + list dec; + + /* Now enough pass() calls should either: + * (a) give us what we want, or + * (b) give us something after what we want, indicating that we will never get what we want, or + * (c) hit the end of the decoder. + */ + if (accurate) { + /* We are being accurate, so we want the right frame. + * This could all be one statement but it's split up for clarity. + */ + while (true) { + if (!decoded_video(frame).empty ()) { + /* We got what we want */ + break; + } + + if (pass ()) { + /* The decoder has nothing more for us */ + break; + } + + if (!_decoded_video.empty() && _decoded_video.front().frame > frame) { + /* We're never going to get the frame we want. Perhaps the caller is asking + * for a video frame before the content's video starts (if its audio + * begins before its video, for example). + */ + break; + } + } + + 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.push_back (_decoded_video.front ()); + } } - - Video (out, same, t); - if (_frame_rate_conversion.repeat) { - Video (image, true, 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); + /* Clean up _decoded_video; keep the frame we are returning, but nothing before that */ + while (!_decoded_video.empty() && _decoded_video.front().frame < dec.front().frame) { + _decoded_video.pop_front (); } - _odd = !_odd; + return dec; } -/** 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. - */ + +/** Called by subclasses when they have a video frame ready */ void -VideoDecoder::subtitle (shared_ptr s) +VideoDecoder::video (shared_ptr image, VideoFrame frame) { - _timed_subtitle = s; + /* We may receive the same frame index twice for 3D, and we need to know + when that happens. + */ + _same = (!_decoded_video.empty() && frame == _decoded_video.back().frame); + + /* Fill in gaps */ + /* XXX: 3D */ + + while (!_decoded_video.empty () && (_decoded_video.back().frame + 1) < frame) { +#ifdef DCPOMATIC_DEBUG + test_gaps++; +#endif + _decoded_video.push_back ( + ContentVideo ( + _decoded_video.back().image, + _decoded_video.back().eyes, + _decoded_video.back().part, + _decoded_video.back().frame + 1 + ) + ); + } - 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)); + switch (_video_content->video_frame_type ()) { + case VIDEO_FRAME_TYPE_2D: + _decoded_video.push_back (ContentVideo (image, EYES_BOTH, PART_WHOLE, frame)); + break; + case VIDEO_FRAME_TYPE_3D_ALTERNATE: + _decoded_video.push_back (ContentVideo (image, _same ? EYES_RIGHT : EYES_LEFT, PART_WHOLE, frame)); + break; + case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT: + _decoded_video.push_back (ContentVideo (image, EYES_LEFT, PART_LEFT_HALF, frame)); + _decoded_video.push_back (ContentVideo (image, EYES_RIGHT, PART_RIGHT_HALF, frame)); + break; + case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM: + _decoded_video.push_back (ContentVideo (image, EYES_LEFT, PART_TOP_HALF, frame)); + _decoded_video.push_back (ContentVideo (image, EYES_RIGHT, PART_BOTTOM_HALF, frame)); + break; + case VIDEO_FRAME_TYPE_3D_LEFT: + _decoded_video.push_back (ContentVideo (image, EYES_LEFT, PART_WHOLE, frame)); + break; + case VIDEO_FRAME_TYPE_3D_RIGHT: + _decoded_video.push_back (ContentVideo (image, EYES_RIGHT, PART_WHOLE, frame)); + break; + default: + assert (false); } } + +void +VideoDecoder::seek (ContentTime, bool) +{ + _decoded_video.clear (); +} +