From 9aa5eac5e3e2636f08a85a7d4f850f5b9dff8c7b Mon Sep 17 00:00:00 2001
From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Date: Wed, 3 Dec 2014 15:45:52 +0100
Subject: [PATCH] plugins: ensure VA display matches GL context expectations.

If a GstGLContext is supplied by the downstream element, then make
sure that the VA plugin element gets a compatible display to what
is requested by the GL context. e.g. re-allocate a VA/GLX display
when a GLX context is provided by the downstream element.
---
 gst/vaapi/gstvaapipluginbase.c | 60 ++++++++++++++++++++++++++++++++--
 gst/vaapi/gstvaapipluginbase.h |  5 +++
 gst/vaapi/gstvaapipluginutil.c |  3 +-
 3 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/gst/vaapi/gstvaapipluginbase.c b/gst/vaapi/gstvaapipluginbase.c
index 22300e6550..c4adb8bb36 100644
--- a/gst/vaapi/gstvaapipluginbase.c
+++ b/gst/vaapi/gstvaapipluginbase.c
@@ -313,6 +313,35 @@ gst_vaapi_plugin_base_close (GstVaapiPluginBase * plugin)
   gst_video_info_init (&plugin->srcpad_info);
 }
 
+/**
+ * gst_vaapi_plugin_base_has_display_type:
+ * @plugin: a #GstVaapiPluginBase
+ * @display_type_req: the desired #GstVaapiDisplayType
+ *
+ * Checks whether the @plugin elements already has a #GstVaapiDisplay
+ * instance compatible with type @display_type_req.
+ *
+ * Return value: %TRUE if @plugin has a compatible display, %FALSE otherwise
+ */
+gboolean
+gst_vaapi_plugin_base_has_display_type (GstVaapiPluginBase * plugin,
+    GstVaapiDisplayType display_type_req)
+{
+  GstVaapiDisplayType display_type;
+
+  if (!plugin->display)
+    return FALSE;
+
+  display_type = plugin->display_type;
+  if (gst_vaapi_display_type_is_compatible (display_type, display_type_req))
+    return TRUE;
+
+  display_type = gst_vaapi_display_get_class_type (plugin->display);
+  if (gst_vaapi_display_type_is_compatible (display_type, display_type_req))
+    return TRUE;
+  return FALSE;
+}
+
 /**
  * gst_vaapi_plugin_base_set_display_type:
  * @plugin: a #GstVaapiPluginBase
@@ -357,9 +386,7 @@ gst_vaapi_plugin_base_set_display_name (GstVaapiPluginBase * plugin,
 gboolean
 gst_vaapi_plugin_base_ensure_display (GstVaapiPluginBase * plugin)
 {
-  if (plugin->display
-      && gst_vaapi_display_type_is_compatible (plugin->display_type,
-          plugin->display_type_req))
+  if (gst_vaapi_plugin_base_has_display_type (plugin, plugin->display_type_req))
     return TRUE;
   gst_vaapi_display_replace (&plugin->display, NULL);
 
@@ -673,6 +700,12 @@ gst_vaapi_plugin_base_decide_allocation (GstVaapiPluginBase * plugin,
 #endif
 #endif
 
+  /* Make sure the display we pass down to the buffer pool is actually
+     the expected one, especially when the downstream element requires
+     a GLX or EGL display */
+  if (!gst_vaapi_plugin_base_ensure_display (plugin))
+    goto error_ensure_display;
+
   gst_video_info_init (&vi);
   gst_video_info_from_caps (&vi, caps);
   if (GST_VIDEO_INFO_FORMAT (&vi) == GST_VIDEO_FORMAT_ENCODED)
@@ -757,6 +790,12 @@ error_no_caps:
     GST_ERROR_OBJECT (plugin, "no caps specified");
     return FALSE;
   }
+error_ensure_display:
+  {
+    GST_ERROR_OBJECT (plugin, "failed to ensure display of type %d",
+        plugin->display_type_req);
+    return FALSE;
+  }
 error_create_pool:
   {
     GST_ERROR_OBJECT (plugin, "failed to create buffer pool");
@@ -974,6 +1013,21 @@ gst_vaapi_plugin_base_set_gl_context (GstVaapiPluginBase * plugin,
     GstObject * object)
 {
 #if USE_GST_GL_HELPERS
+  GstGLContext *const gl_context = GST_GL_CONTEXT (object);
+  GstVaapiDisplayType display_type;
+
   gst_object_replace (&plugin->gl_context, object);
+
+  switch (gst_gl_context_get_gl_platform (gl_context)) {
+#if USE_GLX
+    case GST_GL_PLATFORM_GLX:
+      display_type = GST_VAAPI_DISPLAY_TYPE_GLX;
+      break;
+#endif
+    default:
+      display_type = plugin->display_type;
+      break;
+  }
+  gst_vaapi_plugin_base_set_display_type (plugin, display_type);
 #endif
 }
diff --git a/gst/vaapi/gstvaapipluginbase.h b/gst/vaapi/gstvaapipluginbase.h
index 717716a19b..d444c6a745 100644
--- a/gst/vaapi/gstvaapipluginbase.h
+++ b/gst/vaapi/gstvaapipluginbase.h
@@ -196,6 +196,11 @@ G_GNUC_INTERNAL
 void
 gst_vaapi_plugin_base_close (GstVaapiPluginBase * plugin);
 
+G_GNUC_INTERNAL
+gboolean
+gst_vaapi_plugin_base_has_display_type (GstVaapiPluginBase * plugin,
+    GstVaapiDisplayType display_type_req);
+
 G_GNUC_INTERNAL
 void
 gst_vaapi_plugin_base_set_display_type (GstVaapiPluginBase * plugin,
diff --git a/gst/vaapi/gstvaapipluginutil.c b/gst/vaapi/gstvaapipluginutil.c
index d3b2058570..72f2382977 100644
--- a/gst/vaapi/gstvaapipluginutil.c
+++ b/gst/vaapi/gstvaapipluginutil.c
@@ -122,8 +122,7 @@ gst_vaapi_ensure_display (gpointer element, GstVaapiDisplayType type)
   gst_vaapi_video_context_prepare (context, display_types);
 
   /* Neighbour found and it updated the display */
-  if (plugin->display
-      && gst_vaapi_display_type_is_compatible (plugin->display_type, type))
+  if (gst_vaapi_plugin_base_has_display_type (plugin, type))
     return TRUE;
 
   /* If no neighboor, or application not interested, use system default */