X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.cc;h=31dc3cdc204836e821b385b0280d2c13f2defb31;hb=9922c1f2eaea674ba2ff6cce5f5853655fd8ad7a;hp=5dd078553659b21d3c09bcf8a030ea77e73ad783;hpb=b56bc3c45953fe113a9934b0d2ec2c1134de07ab;p=dcpomatic.git diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index 5dd078553..31dc3cdc2 100644 --- a/src/lib/video_decoder.cc +++ b/src/lib/video_decoder.cc @@ -19,12 +19,18 @@ #include "video_decoder.h" #include "image.h" -#include "content_video.h" +#include "image_proxy.h" +#include "raw_image_proxy.h" +#include "raw_image_proxy.h" +#include "film.h" +#include "log.h" #include "i18n.h" using std::cout; using std::list; +using std::max; +using std::back_inserter; using boost::shared_ptr; using boost::optional; @@ -35,9 +41,11 @@ 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 @@ -66,7 +74,7 @@ VideoDecoder::get_video (VideoFrame frame, bool accurate) 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); } @@ -88,7 +96,7 @@ VideoDecoder::get_video (VideoFrame frame, bool accurate) break; } - if (pass ()) { + if (pass (PASS_REASON_VIDEO)) { /* The decoder has nothing more for us */ break; } @@ -105,13 +113,14 @@ VideoDecoder::get_video (VideoFrame frame, bool accurate) dec = decoded_video (frame); } else { /* Any frame will do: use the first one that comes out of pass() */ - while (_decoded_video.empty() && !pass ()) {} + while (_decoded_video.empty() && !pass (PASS_REASON_VIDEO)) {} if (!_decoded_video.empty ()) { dec.push_back (_decoded_video.front ()); } } - /* Clean up _decoded_video; keep the frame we are returning, but nothing before that */ + /* Clean up _decoded_video; keep the frame we are returning (which may have two images + for 3D), but nothing before that */ while (!_decoded_video.empty() && _decoded_video.front().frame < dec.front().frame) { _decoded_video.pop_front (); } @@ -119,62 +128,202 @@ VideoDecoder::get_video (VideoFrame frame, bool accurate) return dec; } +/** Fill _decoded_video from `from' up to, but not including, `to' */ +void +VideoDecoder::fill_2d (VideoFrame from, VideoFrame to) +{ + if (to == 0) { + /* Already OK */ + return; + } -/** Called by subclasses when they have a video frame ready */ + /* Fill with black... */ + boost::shared_ptr filler_image (new RawImageProxy (_black_image)); + Part filler_part = PART_WHOLE; + + /* ...unless there's some video we can fill with */ + if (!_decoded_video.empty ()) { + filler_image = _decoded_video.back().image; + filler_part = _decoded_video.back().part; + } + + VideoFrame filler_frame = from; + + while (filler_frame < to) { + +#ifdef DCPOMATIC_DEBUG + test_gaps++; +#endif + _decoded_video.push_back ( + ContentVideo (filler_image, EYES_BOTH, filler_part, filler_frame) + ); + + ++filler_frame; + } +} + +/** Fill _decoded_video from `from' up to, but not including, `to' */ void -VideoDecoder::video (shared_ptr image, VideoFrame frame) +VideoDecoder::fill_3d (VideoFrame from, VideoFrame to, Eyes eye) { - /* 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); + if (to == 0 && eye == EYES_LEFT) { + /* Already OK */ + return; + } + + /* Fill with black... */ + boost::shared_ptr filler_left_image (new RawImageProxy (_black_image)); + boost::shared_ptr filler_right_image (new RawImageProxy (_black_image)); + Part filler_left_part = PART_WHOLE; + Part filler_right_part = PART_WHOLE; + + /* ...unless there's some video we can fill with */ + for (list::const_reverse_iterator i = _decoded_video.rbegin(); i != _decoded_video.rend(); ++i) { + if (i->eyes == EYES_LEFT && !filler_left_image) { + filler_left_image = i->image; + filler_left_part = i->part; + } else if (i->eyes == EYES_RIGHT && !filler_right_image) { + filler_right_image = i->image; + filler_right_part = i->part; + } + + if (filler_left_image && filler_right_image) { + break; + } + } + + VideoFrame filler_frame = from; + Eyes filler_eye = _decoded_video.empty() ? EYES_LEFT : _decoded_video.back().eyes; + + if (_decoded_video.empty ()) { + filler_frame = 0; + filler_eye = EYES_LEFT; + } else if (_decoded_video.back().eyes == EYES_LEFT) { + filler_frame = _decoded_video.back().frame; + filler_eye = EYES_RIGHT; + } else if (_decoded_video.back().eyes == EYES_RIGHT) { + filler_frame = _decoded_video.back().frame + 1; + filler_eye = EYES_LEFT; + } - /* Fill in gaps */ - /* XXX: 3D */ + while (filler_frame != to || filler_eye != eye) { - 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 + filler_eye == EYES_LEFT ? filler_left_image : filler_right_image, + filler_eye, + filler_eye == EYES_LEFT ? filler_left_part : filler_right_part, + filler_frame ) ); + + if (filler_eye == EYES_LEFT) { + filler_eye = EYES_RIGHT; + } else { + filler_eye = EYES_LEFT; + ++filler_frame; + } } +} +/** Called by subclasses when they have a video frame ready */ +void +VideoDecoder::video (shared_ptr image, VideoFrame frame) +{ + if (_ignore_video) { + return; + } + + /* We may receive the same frame index twice for 3D, and we need to know + when that happens. + */ + 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; switch (_video_content->video_frame_type ()) { case VIDEO_FRAME_TYPE_2D: - _decoded_video.push_back (ContentVideo (image, EYES_BOTH, PART_WHOLE, frame)); + to_push.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)); + to_push.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)); + to_push.push_back (ContentVideo (image, EYES_LEFT, PART_LEFT_HALF, frame)); + to_push.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)); + to_push.push_back (ContentVideo (image, EYES_LEFT, PART_TOP_HALF, frame)); + to_push.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)); + to_push.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)); + 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 + via get_video(). Hence we need to fill in any gap between the last thing in _decoded_video + and the things we are about to push. + */ + + boost::optional from; + boost::optional to; + + if (_decoded_video.empty() && _last_seek_time && _last_seek_accurate) { + from = _last_seek_time->frames (_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; + } + + /* It has been known that this method receives frames out of order; at this + point I'm not sure why, but we'll just ignore them. + */ + + if (from && to && from.get() > to.get()) { + _video_content->film()->log()->log ( + String::compose ("Ignoring out-of-order decoded frame %1 after %2", to.get(), from.get()), Log::TYPE_WARNING + ); + 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); + } + } + + 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 -VideoDecoder::seek (ContentTime, bool) +VideoDecoder::seek (ContentTime s, bool accurate) { _decoded_video.clear (); + _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; +}