X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.cc;h=fd5779a657f0304124a28ef27980a62a85a1945a;hb=bb9d1f9e0f1aa818d1ac2145f05563e4c95d41b1;hp=fcc262163ecab19844fdd992b641d4d3a2d12c31;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index fcc262163..fd5779a65 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,11 +19,11 @@ #include "video_decoder.h" #include "image.h" -#include "image_proxy.h" -#include "raw_image_proxy.h" #include "raw_image_proxy.h" #include "film.h" #include "log.h" +#include "compose.hpp" +#include #include "i18n.h" @@ -44,7 +44,7 @@ VideoDecoder::VideoDecoder (shared_ptr c) , _last_seek_accurate (true) , _ignore_video (false) { - _black_image.reset (new Image (PIX_FMT_RGB24, _video_content->video_size(), true)); + _black_image.reset (new Image (AV_PIX_FMT_RGB24, _video_content->video_size(), true)); _black_image->make_black (); } @@ -75,6 +75,8 @@ VideoDecoder::get_video (Frame frame, bool accurate) one after the end of _decoded_video we need to seek. */ + _video_content->film()->log()->log (String::compose ("VD has request for %1", frame), LogEntry::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); } @@ -96,7 +98,7 @@ VideoDecoder::get_video (Frame frame, bool accurate) break; } - if (pass ()) { + if (pass (PASS_REASON_VIDEO, accurate)) { /* The decoder has nothing more for us */ break; } @@ -113,7 +115,7 @@ VideoDecoder::get_video (Frame 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, accurate)) {} if (!_decoded_video.empty ()) { dec.push_back (_decoded_video.front ()); } @@ -128,9 +130,12 @@ VideoDecoder::get_video (Frame 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 (Frame from, Frame to) +VideoDecoder::fill_one_eye (Frame from, Frame to, Eyes eye) { if (to == 0) { /* Already OK */ @@ -138,7 +143,7 @@ VideoDecoder::fill_2d (Frame from, Frame 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 */ @@ -152,14 +157,16 @@ VideoDecoder::fill_2d (Frame from, Frame to) test_gaps++; #endif _decoded_video.push_back ( - ContentVideo (filler_image, EYES_BOTH, filler_part, i) + ContentVideo (filler_image, eye, filler_part, i) ); } } -/** 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 (Frame from, Frame to, Eyes eye) +VideoDecoder::fill_both_eyes (Frame from, Frame to, Eyes eye) { if (to == 0 && eye == EYES_LEFT) { /* Already OK */ @@ -167,8 +174,8 @@ VideoDecoder::fill_3d (Frame from, Frame 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; @@ -233,6 +240,8 @@ VideoDecoder::video (shared_ptr image, Frame frame) return; } + _video_content->film()->log()->log (String::compose ("VD receives %1", frame), LogEntry::TYPE_DEBUG_DECODE); + /* We may receive the same frame index twice for 3D, and we need to know when that happens. */ @@ -270,42 +279,53 @@ VideoDecoder::video (shared_ptr image, Frame 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; } - /* 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 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()) { - _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); + 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. + /* We can't let this build up too much or we will run out of memory. There is a + `best' value for the allowed size of _decoded_video which balances memory use + with decoding efficiency (lack of seeks). Throwing away video frames here + is not a problem for correctness, so do it. */ - DCPOMATIC_ASSERT (_decoded_video.size() <= 96); + while (_decoded_video.size() > 96) { + _decoded_video.pop_back (); + } } void