X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.cc;h=bd609d1683ddd0fca0ee82ca9da8bd7eeaed725b;hb=7f2e74604a51b984e4c8cbb5d5f4bb642677ec00;hp=fd82384416b6166a461b0f9d9d43e1430ae2695b;hpb=9525e7726e4d488f193957d4fcf1cc1725581ae8;p=dcpomatic.git diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index fd8238441..bd609d168 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,68 +18,153 @@ */ #include "video_decoder.h" -#include "subtitle.h" -#include "film.h" #include "image.h" -#include "log.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) - : Decoder (f) - , _video_frame (0) - , _last_content_time (0) +VideoDecoder::VideoDecoder (shared_ptr c) +#ifdef DCPOMATIC_DEBUG + : test_gaps (0) + , _video_content (c) +#else + : _video_content (c) +#endif { } -/** 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, bool same, double t) +optional +VideoDecoder::decoded_video (VideoFrame frame) +{ + for (list::const_iterator i = _decoded_video.begin(); i != _decoded_video.end(); ++i) { + if (i->frame == frame) { + return *i; + } + } + + return optional (); +} + +optional +VideoDecoder::get_video (VideoFrame frame, bool accurate) { - shared_ptr sub; - if (_timed_subtitle && _timed_subtitle->displayed_at (t)) { - sub = _timed_subtitle->subtitle (); + 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); + } + + optional dec; + + /* Now enough pass() calls should 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. + * This could all be one statement but it's split up for clarity. + */ + while (true) { + if (decoded_video (frame)) { + /* 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 = _decoded_video.front (); + } } - TIMING (N_("Decoder emits %1"), _video_frame); - Video (image, same, sub, t); - ++_video_frame; + /* Clean up decoded_video */ + while (!_decoded_video.empty() && _decoded_video.front().frame < (frame - 1)) { + _decoded_video.pop_front (); + } - _last_content_time = t; + 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; + /* We should not receive the same thing twice */ + assert (_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().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); } } void -VideoDecoder::set_progress (Job* j) const +VideoDecoder::seek (ContentTime, bool) { - assert (j); - - if (_film->video_length()) { - j->set_progress (float (_video_frame) / _film->video_length()); - } + _decoded_video.clear (); } +