X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.cc;h=5867ac9257aacc31f8c712039c093f531e636771;hb=0337475d923422f160e000020f320c8c97524a02;hp=f61e63d4d1a4c312c99054c436bfee462f2afdab;hpb=d39bfb9a1360a83f3451b79d01fdc4f465ef21d3;p=dcpomatic.git

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index f61e63d4d..5867ac925 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     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
@@ -18,45 +18,47 @@
 */
 
 #include "video_decoder.h"
-#include "subtitle.h"
-#include "film.h"
 #include "image.h"
-#include "ratio.h"
 
 #include "i18n.h"
 
 using std::cout;
 using boost::shared_ptr;
 
-VideoDecoder::VideoDecoder (shared_ptr<const Film> f)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoContent> c)
 	: Decoder (f)
+	, _video_content (c)
 	, _video_position (0)
 {
 
 }
 
 void
-VideoDecoder::video (shared_ptr<const Image> image, bool same, VideoContent::Frame frame)
+VideoDecoder::video (shared_ptr<const ImageProxy> image, bool same, VideoContent::Frame frame)
 {
-        Video (image, same, frame);
-	_video_position = frame + 1;
-}
-
-#if 0
-
-/** Called by subclasses when a subtitle is ready.
- *  s may be 0 to say that there is no current subtitle.
- *  @param s New current subtitle, or 0.
- */
-void
-VideoDecoder::subtitle (shared_ptr<TimedSubtitle> s)
-{
-	_timed_subtitle = s;
-	
-	if (_timed_subtitle) {
-		Position const p = _timed_subtitle->subtitle()->position ();
-		_timed_subtitle->subtitle()->set_position (Position (p.x - _video_content->crop().left, p.y - _video_content->crop().top));
+	switch (_video_content->video_frame_type ()) {
+	case VIDEO_FRAME_TYPE_2D:
+		Video (image, EYES_BOTH, PART_WHOLE, same, frame);
+		break;
+	case VIDEO_FRAME_TYPE_3D_ALTERNATE:
+		Video (image, (frame % 2) ? EYES_RIGHT : EYES_LEFT, PART_WHOLE, same, frame / 2);
+		break;
+	case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
+		Video (image, EYES_LEFT, PART_LEFT_HALF, same, frame);
+		Video (image, EYES_RIGHT, PART_RIGHT_HALF, same, frame);
+		break;
+	case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
+		Video (image, EYES_LEFT, PART_TOP_HALF, same, frame);
+		Video (image, EYES_RIGHT, PART_BOTTOM_HALF, same, frame);
+		break;
+	case VIDEO_FRAME_TYPE_3D_LEFT:
+		Video (image, EYES_LEFT, PART_WHOLE, same, frame);
+		break;
+	case VIDEO_FRAME_TYPE_3D_RIGHT:
+		Video (image, EYES_RIGHT, PART_WHOLE, same, frame);
+		break;
 	}
+	
+	_video_position = frame + 1;
 }
-#endif