#include "log.h"
#include "compose.hpp"
#include <boost/foreach.hpp>
-#include <boost/make_shared.hpp>
#include <iostream>
#include "i18n.h"
using std::max;
using std::back_inserter;
using boost::shared_ptr;
-using boost::make_shared;
using boost::optional;
VideoDecoder::VideoDecoder (Decoder* parent, shared_ptr<const Content> c, shared_ptr<Log> log)
_parent->seek (ContentTime::from_frames (frame, _content->active_video_frame_rate()), accurate);
}
- unsigned int const frames_wanted = _content->video->frame_type() == VIDEO_FRAME_TYPE_2D ? 1 : 2;
+ unsigned int frames_wanted = 0;
+ switch (_content->video->frame_type()) {
+ case VIDEO_FRAME_TYPE_2D:
+ case VIDEO_FRAME_TYPE_3D:
+ case VIDEO_FRAME_TYPE_3D_ALTERNATE:
+ case VIDEO_FRAME_TYPE_3D_LEFT:
+ case VIDEO_FRAME_TYPE_3D_RIGHT:
+ frames_wanted = 1;
+ break;
+ case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
+ case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
+ frames_wanted = 2;
+ break;
+ default:
+ DCPOMATIC_ASSERT (false);
+ }
list<ContentVideo> dec;
}
/* Clean up _decoded; keep the frame we are returning, if any (which may have two images
- for 3D), but nothing before that */
+ for 3D), but nothing before that
+ */
while (!_decoded.empty() && !dec.empty() && _decoded.front().frame.index() < dec.front().frame.index()) {
_decoded.pop_front ();
}
}
/* Fill with black... */
- shared_ptr<const ImageProxy> filler_image = make_shared<RawImageProxy> (_black_image);
+ shared_ptr<const ImageProxy> filler_image (new RawImageProxy (_black_image));
Part filler_part = PART_WHOLE;
/* ...unless there's some video we can fill with */
VideoDecoder::fill_both_eyes (VideoFrame from, VideoFrame to)
{
/* Fill with black... */
- shared_ptr<const ImageProxy> filler_left_image = make_shared<RawImageProxy> (_black_image);
- shared_ptr<const ImageProxy> filler_right_image = make_shared<RawImageProxy> (_black_image);
+ shared_ptr<const ImageProxy> filler_left_image (new RawImageProxy (_black_image));
+ shared_ptr<const ImageProxy> filler_right_image (new RawImageProxy (_black_image));
Part filler_left_part = PART_WHOLE;
Part filler_right_part = PART_WHOLE;
_content->video->frame_type() == VIDEO_FRAME_TYPE_2D ? EYES_BOTH : EYES_LEFT
);
} else if (!_decoded.empty ()) {
+ /* Get the last frame we have */
from = _decoded.back().frame;
+ /* And move onto the first frame we need */
++(*from);
+ if (_content->video->frame_type() == VIDEO_FRAME_TYPE_3D_LEFT || _content->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
+ /* The previous ++ will increment a 3D-left-eye to the same index right-eye. If we are dealing with
+ a single-eye source we need an extra ++ to move back to the same eye.
+ */
+ ++(*from);
+ }
}
/* 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 && (*from) > to_push.front().frame) {
return;
}
- if (from) {
- switch (_content->video->frame_type ()) {
- case VIDEO_FRAME_TYPE_2D:
- fill_one_eye (from->index(), to_push.front().frame.index(), EYES_BOTH);
- break;
- case VIDEO_FRAME_TYPE_3D:
- 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_push.front().frame);
- break;
- case VIDEO_FRAME_TYPE_3D_LEFT:
- fill_one_eye (from->index(), to_push.front().frame.index(), EYES_LEFT);
- break;
- case VIDEO_FRAME_TYPE_3D_RIGHT:
- fill_one_eye (from->index(), to_push.front().frame.index(), EYES_RIGHT);
- break;
+ int const max_decoded_size = 96;
+
+ /* If _decoded is already `full' there is no point in adding anything more to it,
+ as the new stuff will just be removed again.
+ */
+ if (_decoded.size() < max_decoded_size) {
+ if (from) {
+ switch (_content->video->frame_type ()) {
+ case VIDEO_FRAME_TYPE_2D:
+ fill_one_eye (from->index(), to_push.front().frame.index(), EYES_BOTH);
+ break;
+ case VIDEO_FRAME_TYPE_3D:
+ 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_push.front().frame);
+ break;
+ case VIDEO_FRAME_TYPE_3D_LEFT:
+ fill_one_eye (from->index(), to_push.front().frame.index(), EYES_LEFT);
+ break;
+ case VIDEO_FRAME_TYPE_3D_RIGHT:
+ fill_one_eye (from->index(), to_push.front().frame.index(), EYES_RIGHT);
+ break;
+ }
}
- }
- copy (to_push.begin(), to_push.end(), back_inserter (_decoded));
+ copy (to_push.begin(), to_push.end(), back_inserter (_decoded));
+ }
/* 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 which balances memory use
with decoding efficiency (lack of seeks). Throwing away video frames here
is not a problem for correctness, so do it.
*/
- while (_decoded.size() > 96) {
+ while (_decoded.size() > max_decoded_size) {
_decoded.pop_back ();
}
}