diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-13 16:08:22 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-13 16:08:22 +0100 |
| commit | 78012b8cf9b4c6e35b425c97b6432551ce635c3a (patch) | |
| tree | 3e6045b6f94de0677af11bb5c0fe6e15af6900a6 /src | |
| parent | 13aae5d8ff27886656ab7ea3ef1194987954bb3f (diff) | |
Add 3D video frame type for, e.g. 3D DCP inputs (part of #806).
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/types.cc | 4 | ||||
| -rw-r--r-- | src/lib/types.h | 2 | ||||
| -rw-r--r-- | src/lib/video_content.cc | 1 | ||||
| -rw-r--r-- | src/wx/video_panel.cc | 1 |
4 files changed, 8 insertions, 0 deletions
diff --git a/src/lib/types.cc b/src/lib/types.cc index ce5081464..f31e7a3ec 100644 --- a/src/lib/types.cc +++ b/src/lib/types.cc @@ -95,6 +95,8 @@ video_frame_type_to_string (VideoFrameType t) switch (t) { case VIDEO_FRAME_TYPE_2D: return "2d"; + case VIDEO_FRAME_TYPE_3D: + return "3d"; case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT: return "3d-left-right"; case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM: @@ -117,6 +119,8 @@ string_to_video_frame_type (string s) { if (s == "2d") { return VIDEO_FRAME_TYPE_2D; + } else if (s == "3d") { + return VIDEO_FRAME_TYPE_3D; } else if (s == "3d-left-right") { return VIDEO_FRAME_TYPE_3D_LEFT_RIGHT; } else if (s == "3d-top-bottom") { diff --git a/src/lib/types.h b/src/lib/types.h index 8513fde51..041db1786 100644 --- a/src/lib/types.h +++ b/src/lib/types.h @@ -78,6 +78,8 @@ typedef int64_t Frame; enum VideoFrameType { VIDEO_FRAME_TYPE_2D, + /** `True' 3D content, e.g. 3D DCPs */ + VIDEO_FRAME_TYPE_3D, VIDEO_FRAME_TYPE_3D_LEFT_RIGHT, VIDEO_FRAME_TYPE_3D_TOP_BOTTOM, VIDEO_FRAME_TYPE_3D_ALTERNATE, diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 66c63961e..a59e9669d 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -303,6 +303,7 @@ VideoContent::size_after_3d_split () const dcp::Size const s = size (); switch (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: diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index 8a8dbd181..18d589483 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -232,6 +232,7 @@ VideoPanel::VideoPanel (ContentPanel* p) } _frame_type->wrapped()->Append (_("2D")); + _frame_type->wrapped()->Append (_("3D")); _frame_type->wrapped()->Append (_("3D left/right")); _frame_type->wrapped()->Append (_("3D top/bottom")); _frame_type->wrapped()->Append (_("3D alternate")); |