X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.cc;h=e87fa2eb1dec8d3b07b60273da075662867322e5;hb=267e21bfb78593bcb87eb24ce01b88d0859566f7;hp=cab1a979fc2dc48502015e7b73940f7889f3ea16;hpb=09d7c1aeab76040e1dcbd829fbf734c4f4706180;p=dcpomatic.git diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index cab1a979f..e87fa2eb1 100644 --- a/src/lib/video_decoder.cc +++ b/src/lib/video_decoder.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 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 @@ -19,9 +19,11 @@ #include "video_decoder.h" #include "image.h" -#include "image_proxy.h" #include "raw_image_proxy.h" -#include "content_video.h" +#include "film.h" +#include "log.h" +#include "compose.hpp" +#include #include "i18n.h" @@ -39,18 +41,18 @@ VideoDecoder::VideoDecoder (shared_ptr c) #else : _video_content (c) #endif - , _same (false) , _last_seek_accurate (true) + , _ignore_video (false) { _black_image.reset (new Image (PIX_FMT_RGB24, _video_content->video_size(), true)); _black_image->make_black (); } list -VideoDecoder::decoded_video (VideoFrame frame) +VideoDecoder::decoded_video (Frame frame) { list output; - + for (list::const_iterator i = _decoded_video.begin(); i != _decoded_video.end(); ++i) { if (i->frame == frame) { output.push_back (*i); @@ -66,13 +68,15 @@ VideoDecoder::decoded_video (VideoFrame frame) * @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) +VideoDecoder::get_video (Frame 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. */ + _video_content->film()->log()->log (String::compose ("VD has request for %1", frame), Log::TYPE_DEBUG_DECODE); + 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); } @@ -126,9 +130,12 @@ VideoDecoder::get_video (VideoFrame frame, bool accurate) return dec; } -/** Fill _decoded_video from `from' up to, but not including, `to' */ +/** Fill _decoded_video from `from' up to, but not including, `to' with + * a frame for one particular Eyes value (which could be EYES_BOTH, + * EYES_LEFT or EYES_RIGHT) + */ void -VideoDecoder::fill_2d (VideoFrame from, VideoFrame to) +VideoDecoder::fill_one_eye (Frame from, Frame to, Eyes eye) { if (to == 0) { /* Already OK */ @@ -136,7 +143,7 @@ VideoDecoder::fill_2d (VideoFrame from, VideoFrame to) } /* Fill with black... */ - boost::shared_ptr filler_image (new RawImageProxy (_black_image)); + shared_ptr filler_image (new RawImageProxy (_black_image)); Part filler_part = PART_WHOLE; /* ...unless there's some video we can fill with */ @@ -145,24 +152,21 @@ VideoDecoder::fill_2d (VideoFrame from, VideoFrame to) filler_part = _decoded_video.back().part; } - VideoFrame filler_frame = from; - - while (filler_frame < to) { - + for (Frame i = from; i < to; ++i) { #ifdef DCPOMATIC_DEBUG test_gaps++; #endif _decoded_video.push_back ( - ContentVideo (filler_image, EYES_BOTH, filler_part, filler_frame) + ContentVideo (filler_image, eye, filler_part, i) ); - - ++filler_frame; } } -/** Fill _decoded_video from `from' up to, but not including, `to' */ +/** Fill _decoded_video from `from' up to, but not including, `to' + * adding both left and right eye frames. + */ void -VideoDecoder::fill_3d (VideoFrame from, VideoFrame to, Eyes eye) +VideoDecoder::fill_both_eyes (Frame from, Frame to, Eyes eye) { if (to == 0 && eye == EYES_LEFT) { /* Already OK */ @@ -170,8 +174,8 @@ VideoDecoder::fill_3d (VideoFrame from, VideoFrame to, Eyes eye) } /* Fill with black... */ - boost::shared_ptr filler_left_image (new RawImageProxy (_black_image)); - boost::shared_ptr filler_right_image (new RawImageProxy (_black_image)); + shared_ptr filler_left_image (new RawImageProxy (_black_image)); + shared_ptr filler_right_image (new RawImageProxy (_black_image)); Part filler_left_part = PART_WHOLE; Part filler_right_part = PART_WHOLE; @@ -190,7 +194,7 @@ VideoDecoder::fill_3d (VideoFrame from, VideoFrame to, Eyes eye) } } - VideoFrame filler_frame = from; + Frame filler_frame = from; Eyes filler_eye = _decoded_video.empty() ? EYES_LEFT : _decoded_video.back().eyes; if (_decoded_video.empty ()) { @@ -227,15 +231,21 @@ VideoDecoder::fill_3d (VideoFrame from, VideoFrame to, Eyes eye) } } } - + /** Called by subclasses when they have a video frame ready */ void -VideoDecoder::video (shared_ptr image, VideoFrame frame) +VideoDecoder::video (shared_ptr image, Frame frame) { + if (_ignore_video) { + return; + } + + _video_content->film()->log()->log (String::compose ("VD receives %1", frame), Log::TYPE_DEBUG_DECODE); + /* 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); + bool const same = (!_decoded_video.empty() && frame == _decoded_video.back().frame); /* Work out what we are going to push into _decoded_video next */ list to_push; @@ -244,7 +254,7 @@ VideoDecoder::video (shared_ptr image, VideoFrame frame) to_push.push_back (ContentVideo (image, EYES_BOTH, PART_WHOLE, frame)); break; case VIDEO_FRAME_TYPE_3D_ALTERNATE: - to_push.push_back (ContentVideo (image, _same ? EYES_RIGHT : EYES_LEFT, PART_WHOLE, frame)); + to_push.push_back (ContentVideo (image, same ? EYES_RIGHT : EYES_LEFT, PART_WHOLE, frame)); break; case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT: to_push.push_back (ContentVideo (image, EYES_LEFT, PART_LEFT_HALF, frame)); @@ -261,7 +271,7 @@ VideoDecoder::video (shared_ptr image, VideoFrame frame) to_push.push_back (ContentVideo (image, EYES_RIGHT, PART_WHOLE, frame)); break; default: - assert (false); + DCPOMATIC_ASSERT (false); } /* Now VideoDecoder is required never to have gaps in the frames that it presents @@ -269,26 +279,49 @@ VideoDecoder::video (shared_ptr image, VideoFrame frame) and the things we are about to push. */ - boost::optional from; - boost::optional to; - + optional from; + optional to; + if (_decoded_video.empty() && _last_seek_time && _last_seek_accurate) { - from = _last_seek_time->frames (_video_content->video_frame_rate ()); + from = _last_seek_time->frames_round (_video_content->video_frame_rate ()); to = to_push.front().frame; } else if (!_decoded_video.empty ()) { from = _decoded_video.back().frame + 1; to = to_push.front().frame; } + /* If we've pre-rolled on a seek we may now receive out-of-order frames + (frames before the last seek time) which we can just ignore. + */ + + if (from && to && from.get() > to.get()) { + return; + } + if (from) { - if (_video_content->video_frame_type() == VIDEO_FRAME_TYPE_2D) { - fill_2d (from.get(), to.get ()); - } else { - fill_3d (from.get(), to.get(), to_push.front().eyes); + switch (_video_content->video_frame_type ()) { + case VIDEO_FRAME_TYPE_2D: + fill_one_eye (from.get(), to.get (), EYES_BOTH); + break; + case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT: + case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM: + case VIDEO_FRAME_TYPE_3D_ALTERNATE: + fill_both_eyes (from.get(), to.get(), to_push.front().eyes); + break; + case VIDEO_FRAME_TYPE_3D_LEFT: + fill_one_eye (from.get(), to.get (), EYES_LEFT); + break; + case VIDEO_FRAME_TYPE_3D_RIGHT: + fill_one_eye (from.get(), to.get (), EYES_RIGHT); } } copy (to_push.begin(), to_push.end(), back_inserter (_decoded_video)); + + /* We can't let this build up too much or we will run out of memory. We need to allow + the most frames that can exist between blocks of sound in a multiplexed file. + */ + DCPOMATIC_ASSERT (_decoded_video.size() <= 96); } void @@ -298,3 +331,10 @@ VideoDecoder::seek (ContentTime s, bool accurate) _last_seek_time = s; _last_seek_accurate = accurate; } + +/** Set this player never to produce any video data */ +void +VideoDecoder::set_ignore_video () +{ + _ignore_video = true; +}