Various small fixes.

1 files changed, 26 insertions, 14 deletions

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index f3d3a3104..34299bd3c 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -34,27 +34,27 @@ VideoDecoder::VideoDecoder (shared_ptr<const VideoContent> c)
 
 }
 
-shared_ptr<ContentVideo>
+optional<ContentVideo>
 VideoDecoder::decoded_video (VideoFrame frame)
 {
-	for (list<shared_ptr<ContentVideo> >::const_iterator i = _decoded_video.begin(); i != _decoded_video.end(); ++i) {
-		if ((*i)->frame == frame) {
+	for (list<ContentVideo>::const_iterator i = _decoded_video.begin(); i != _decoded_video.end(); ++i) {
+		if (i->frame == frame) {
 			return *i;
 		}
 	}
 
-	return shared_ptr<ContentVideo> ();
+	return optional<ContentVideo> ();
 }
 
-shared_ptr<ContentVideo>
+optional<ContentVideo>
 VideoDecoder::get_video (VideoFrame frame, bool accurate)
 {
-	if (_decoded_video.empty() || (frame < _decoded_video.front()->frame || frame > (_decoded_video.back()->frame + 1))) {
+	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);
 	}
 
-	shared_ptr<ContentVideo> dec;
+	optional<ContentVideo> dec;
 
 	/* Now enough pass() calls will either:
 	 *  (a) give us what we want, or
@@ -73,7 +73,7 @@ VideoDecoder::get_video (VideoFrame frame, bool accurate)
 	}
 
 	/* Clean up decoded_video */
-	while (!_decoded_video.empty() && _decoded_video.front()->frame < (frame - 1)) {
+	while (!_decoded_video.empty() && _decoded_video.front().frame < (frame - 1)) {
 		_decoded_video.pop_front ();
 	}
 
@@ -85,25 +85,37 @@ VideoDecoder::get_video (VideoFrame frame, bool accurate)
 void
 VideoDecoder::video (shared_ptr<const Image> image, VideoFrame frame)
 {
+	/* Fill in gaps */
+	/* XXX: 3D */
+	while (!_decoded_video.empty () && (_decoded_video.back().frame + 1) < frame) {
+		_decoded_video.push_back (
+			ContentVideo (
+				_decoded_video.back().image,
+				_decoded_video.back().eyes,
+				_decoded_video.back().frame + 1
+				)
+			);
+	}
+	
 	switch (_video_content->video_frame_type ()) {
 	case VIDEO_FRAME_TYPE_2D:
-		_decoded_video.push_back (shared_ptr<ContentVideo> (new ContentVideo (image, EYES_BOTH, frame)));
+		_decoded_video.push_back (ContentVideo (image, EYES_BOTH, frame));
 		break;
 	case VIDEO_FRAME_TYPE_3D_ALTERNATE:
-		_decoded_video.push_back (shared_ptr<ContentVideo> (new ContentVideo (image, (frame % 2) ? EYES_RIGHT : EYES_LEFT, frame)));
+		_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 (shared_ptr<ContentVideo> (new ContentVideo (image->crop (Crop (0, half, 0, 0), true), EYES_LEFT, frame)));
-		_decoded_video.push_back (shared_ptr<ContentVideo> (new ContentVideo (image->crop (Crop (half, 0, 0, 0), true), EYES_RIGHT, frame)));
+		_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 (shared_ptr<ContentVideo> (new ContentVideo (image->crop (Crop (0, 0, 0, half), true), EYES_LEFT, frame)));
-		_decoded_video.push_back (shared_ptr<ContentVideo> (new ContentVideo (image->crop (Crop (0, 0, half, 0), true), EYES_RIGHT, frame)));
+		_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;
 	}
 	default: