summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Schmidt <jan@centricular.com>2018-02-02 13:02:14 +1100
committerJan Schmidt <jan@centricular.com>2018-02-09 18:16:04 +1100
commit46260654a44b14b0418b25b5e27cabb3089e70f8 (patch)
tree0b97bd4e65093d8406848b1bcba38775d58b91c0
parent577c14495c3ff4c3905e50fe9a8aca3fa42e5177 (diff)
glimagesink: Always display with requested stereo display mode
Even if the input is monoscopic, the app might want to display it in a different layout, to do side-by-side for VR for example, so if the app changes the output-multiview-mode always use that.
-rw-r--r--ext/gl/gstglimagesink.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/ext/gl/gstglimagesink.c b/ext/gl/gstglimagesink.c
index 39ba1110c..e06eef2e0 100644
--- a/ext/gl/gstglimagesink.c
+++ b/ext/gl/gstglimagesink.c
@@ -1384,7 +1384,6 @@ static gboolean
update_output_format (GstGLImageSink * glimage_sink)
{
GstVideoInfo *out_info = &glimage_sink->out_info;
- gboolean input_is_mono = FALSE;
GstVideoMultiviewMode mv_mode;
GstGLWindow *window = NULL;
GstGLTextureTarget previous_target;
@@ -1398,14 +1397,7 @@ update_output_format (GstGLImageSink * glimage_sink)
mv_mode = GST_VIDEO_INFO_MULTIVIEW_MODE (&glimage_sink->in_info);
- if (mv_mode == GST_VIDEO_MULTIVIEW_MODE_NONE ||
- mv_mode == GST_VIDEO_MULTIVIEW_MODE_MONO ||
- mv_mode == GST_VIDEO_MULTIVIEW_MODE_LEFT ||
- mv_mode == GST_VIDEO_MULTIVIEW_MODE_RIGHT)
- input_is_mono = TRUE;
-
- if (input_is_mono == FALSE &&
- glimage_sink->mview_output_mode != GST_VIDEO_MULTIVIEW_MODE_NONE) {
+ if (glimage_sink->mview_output_mode != mv_mode) {
/* Input is multiview, and output wants a conversion - configure 3d converter now,
* otherwise defer it until either the caps or the 3D output mode changes */
gst_video_multiview_video_info_change_mode (out_info,