Basic support for separate 3D left/right sources.

5 files changed, 17 insertions, 3 deletions

diff --git a/src/lib/types.h b/src/lib/types.h
index 8a16818bd..c255bd0d8 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -70,7 +70,11 @@ enum VideoFrameType
 	VIDEO_FRAME_TYPE_2D,
 	VIDEO_FRAME_TYPE_3D_LEFT_RIGHT,
 	VIDEO_FRAME_TYPE_3D_TOP_BOTTOM,
-	VIDEO_FRAME_TYPE_3D_ALTERNATE
+	VIDEO_FRAME_TYPE_3D_ALTERNATE,
+	/** This content is all the left frames of some 3D */
+	VIDEO_FRAME_TYPE_3D_LEFT,
+	/** This content is all the right frames of some 3D */
+	VIDEO_FRAME_TYPE_3D_RIGHT
 };
 
 enum Eyes
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 4a1ef95ac..b704b6447 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -330,6 +330,8 @@ VideoContent::video_size_after_3d_split () const
 	switch (video_frame_type ()) {
 	case VIDEO_FRAME_TYPE_2D:
 	case VIDEO_FRAME_TYPE_3D_ALTERNATE:
+	case VIDEO_FRAME_TYPE_3D_LEFT:
+	case VIDEO_FRAME_TYPE_3D_RIGHT:
 		return s;
 	case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
 		return libdcp::Size (s.width / 2, s.height);
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index f846b7ac9..fbba9c09d 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-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
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 3ae963a20..2a33a8c3a 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
@@ -57,6 +57,12 @@ VideoDecoder::video (shared_ptr<const Image> image, bool same, VideoContent::Fra
 		Video (image->crop (Crop (0, 0, half, 0), true), EYES_RIGHT, same, frame);
 		break;
 	}
+	case VIDEO_FRAME_TYPE_3D_LEFT:
+		Video (image, EYES_LEFT, same, frame);
+		break;
+	case VIDEO_FRAME_TYPE_3D_RIGHT:
+		Video (image, EYES_RIGHT, same, frame);
+		break;
 	}
 	
 	_video_position = frame + 1;
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 56848907b..ac4c29222 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -197,6 +197,8 @@ VideoPanel::VideoPanel (FilmEditor* e)
 	_frame_type->wrapped()->Append (_("3D left/right"));
 	_frame_type->wrapped()->Append (_("3D top/bottom"));
 	_frame_type->wrapped()->Append (_("3D alternate"));
+	_frame_type->wrapped()->Append (_("3D left only"));
+	_frame_type->wrapped()->Append (_("3D right only"));
 
 	_filters_button->Bind           (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&VideoPanel::edit_filters_clicked, this));
 	_colour_conversion_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&VideoPanel::edit_colour_conversion_clicked, this));