configure: drop check for --enable-vaapisink-glx.

vaapisink is now built with support for multiple display types, whenever
they are enabled. The new "display" attribute is used to select a particular
renderer.

configure.ac

@@ -110,11 +110,6 @@ AC_ARG_ENABLE(glx,
                    [enable OpenGL/X11 output @<:@default=yes@:>@]),
     [], [enable_glx="yes"])
 
-AC_ARG_ENABLE(vaapisink-glx,
-    AS_HELP_STRING([--enable-vaapisink-glx],
-                   [enable OpenGL/X11 to vaapisink @<:@default=yes@:>@]),
-    [], [enable_vaapisink_glx="no"])
-
 dnl Check for basic libraries
 AC_CHECK_LIB(m, tan)
 
@@ -387,13 +382,6 @@ AC_CACHE_CHECK([for JPEG decoding API],
     LIBS="$saved_LIBS"
 ])
 
-dnl Check for OpenGL support to vaapisink
-if test "$enable_vaapisink_glx:$USE_GLX" = "yes:1"; then
-    USE_VAAPISINK_GLX=1
-else
-    USE_VAAPISINK_GLX=0
-fi
-
 dnl ---------------------------------------------------------------------------
 dnl -- Generate files and summary                                            --
 dnl ---------------------------------------------------------------------------
@@ -418,10 +406,6 @@ AC_DEFINE_UNQUOTED(USE_GLX, $USE_GLX,
     [Defined to 1 if GLX is enabled])
 AM_CONDITIONAL(USE_GLX, test $USE_GLX -eq 1)
 
-AC_DEFINE_UNQUOTED(USE_VAAPISINK_GLX, $USE_VAAPISINK_GLX,
-    [Defined to 1 to enable GLX support to vaapisink])
-AM_CONDITIONAL(USE_VAAPISINK_GLX, test $USE_VAAPISINK_GLX -eq 1)
-
 pkgconfigdir=${libdir}/pkgconfig
 AC_SUBST(pkgconfigdir)
 
@@ -476,5 +460,4 @@ echo VA-API version ................... : $VA_VERSION_STR
 echo GLX support ...................... : $(yesno $USE_GLX)
 echo VA/X11 support ................... : $(yesno $USE_X11)
 echo VA/GLX support ................... : $(yesno $HAVE_VA_GLX)
-echo VaapiSink/GL ..................... : $(yesno $USE_VAAPISINK_GLX)
 echo

gst/vaapi/gstvaapipluginutil.c

@@ -189,3 +189,25 @@ gst_vaapi_append_surface_caps (GstCaps *out_caps, GstCaps *in_caps)
   }
   return TRUE;
 }
+
+GType
+gst_vaapi_display_type_get_type(void)
+{
+    static GType g_type = 0;
+
+    static const GEnumValue display_types[] = {
+        { GST_VAAPI_DISPLAY_TYPE_AUTO,
+          "Auto detection", "auto" },
+        { GST_VAAPI_DISPLAY_TYPE_X11,
+          "VA/X11 display", "x11" },
+#if USE_GLX
+        { GST_VAAPI_DISPLAY_TYPE_GLX,
+          "VA/GLX display", "glx" },
+#endif
+        { 0, NULL, NULL },
+    };
+
+    if (!g_type)
+        g_type = g_enum_register_static("GstVaapiDisplayType", display_types);
+    return g_type;
+}

gst/vaapi/gstvaapipluginutil.h

@@ -21,13 +21,37 @@
  *  Boston, MA 02110-1301 USA
  */
 
+#ifndef GST_VAAPI_PLUGIN_UTIL_H
+#define GST_VAAPI_PLUGIN_UTIL_H
+
 #include <gst/gst.h>
 #include <gst/video/videocontext.h>
 #include <gst/vaapi/gstvaapidisplay.h>
 
+/**
+ * GstVaapiDisplayType:
+ * @GST_VAAPI_DISPLAY_TYPE_AUTO: Automatic detection of the display type.
+ * @GST_VAAPI_DISPLAY_TYPE_X11: VA/X11 display.
+ * @GST_VAAPI_DISPLAY_TYPE_GLX: VA/GLX display.
+ */
+typedef enum _GstVaapiDisplayType GstVaapiDisplayType;
+enum _GstVaapiDisplayType {
+    GST_VAAPI_DISPLAY_TYPE_AUTO = 0,
+    GST_VAAPI_DISPLAY_TYPE_X11,
+    GST_VAAPI_DISPLAY_TYPE_GLX,
+};
+
+#define GST_VAAPI_TYPE_DISPLAY_TYPE \
+    gst_vaapi_display_type_get_type()
+
+GType
+gst_vaapi_display_type_get_type(void) G_GNUC_CONST;
+
 gboolean gst_vaapi_ensure_display (gpointer element, GstVaapiDisplay **display);
 void gst_vaapi_set_display (const gchar *type, const GValue *value, GstVaapiDisplay **display);
 gboolean gst_vaapi_reply_to_query (GstQuery *query, GstVaapiDisplay *display);
 
 gboolean
 gst_vaapi_append_surface_caps (GstCaps *out_caps, GstCaps *in_caps);
+
+#endif /* GST_VAAPI_PLUGIN_UTIL_H */

gst/vaapi/gstvaapisink.c

@@ -37,9 +37,9 @@
 #include <gst/vaapi/gstvaapivideosink.h>
 #include <gst/vaapi/gstvaapidisplay_x11.h>
 #include <gst/vaapi/gstvaapiwindow_x11.h>
-#if USE_VAAPISINK_GLX
+#if USE_GLX
-#include <gst/vaapi/gstvaapidisplay_glx.h>
+# include <gst/vaapi/gstvaapidisplay_glx.h>
-#include <gst/vaapi/gstvaapiwindow_glx.h>
+# include <gst/vaapi/gstvaapiwindow_glx.h>
 #endif
 
 /* Supported interfaces */
@@ -93,12 +93,14 @@ G_DEFINE_TYPE_WITH_CODE(
 enum {
     PROP_0,
 
-    PROP_USE_GLX,
+    PROP_DISPLAY_TYPE,
     PROP_FULLSCREEN,
     PROP_SYNCHRONOUS,
     PROP_USE_REFLECTION
 };
 
+#define DEFAULT_DISPLAY_TYPE            GST_VAAPI_DISPLAY_TYPE_X11
+
 /* GstImplementsInterface interface */
 
 static gboolean
@@ -148,7 +150,8 @@ gst_vaapisink_xoverlay_set_window_handle(GstXOverlay *overlay, guintptr window)
 
     /* Disable GLX rendering when vaapisink is using a foreign X
        window. It's pretty much useless */
-    sink->use_glx = FALSE;
+    if (sink->display_type == GST_VAAPI_DISPLAY_TYPE_GLX)
+        sink->display_type = GST_VAAPI_DISPLAY_TYPE_X11;
 
     sink->foreign_window = TRUE;
     gst_vaapisink_ensure_window_xid(sink, window);
@@ -257,6 +260,12 @@ configure_notify_event_pending(
     return args.match;
 }
 
+static inline gboolean
+gst_vaapisink_ensure_display(GstVaapiSink *sink)
+{
+    return gst_vaapi_ensure_display(sink, &sink->display);
+}
+
 static gboolean
 gst_vaapisink_ensure_render_rect(GstVaapiSink *sink, guint width, guint height)
 {
@@ -319,12 +328,19 @@ gst_vaapisink_ensure_window(GstVaapiSink *sink, guint width, guint height)
     GstVaapiDisplay * const display = sink->display;
 
     if (!sink->window) {
-#if USE_VAAPISINK_GLX
+        switch (sink->display_type) {
-        if (sink->use_glx)
+#if USE_GLX
+        case GST_VAAPI_DISPLAY_TYPE_GLX:
             sink->window = gst_vaapi_window_glx_new(display, width, height);
-        else
+            break;
 #endif
+        case GST_VAAPI_DISPLAY_TYPE_X11:
             sink->window = gst_vaapi_window_x11_new(display, width, height);
+            break;
+        default:
+            GST_ERROR("unsupported display type %d", sink->display_type);
+            return FALSE;
+        }
         if (sink->window)
             gst_x_overlay_got_window_handle(
                 GST_X_OVERLAY(sink),
@@ -342,7 +358,7 @@ gst_vaapisink_ensure_window_xid(GstVaapiSink *sink, guintptr window_id)
     int x, y;
     XID xid = window_id;
 
-    if (!gst_vaapi_ensure_display(sink, &sink->display))
+    if (!gst_vaapisink_ensure_display(sink))
         return FALSE;
 
     gst_vaapi_display_lock(sink->display);
@@ -368,12 +384,19 @@ gst_vaapisink_ensure_window_xid(GstVaapiSink *sink, guintptr window_id)
 
     g_clear_object(&sink->window);
 
-#if USE_VAAPISINK_GLX
+    switch (sink->display_type) {
-    if (sink->use_glx)
+#if USE_GLX
+    case GST_VAAPI_DISPLAY_TYPE_GLX:
         sink->window = gst_vaapi_window_glx_new_with_xid(sink->display, xid);
-    else
+        break;
 #endif
+    case GST_VAAPI_DISPLAY_TYPE_X11:
         sink->window = gst_vaapi_window_x11_new_with_xid(sink->display, xid);
+        break;
+    default:
+        GST_ERROR("unsupported display type %d", sink->display_type);
+        return FALSE;
+    }
     return sink->window != NULL;
 }
 
@@ -382,7 +405,7 @@ gst_vaapisink_start(GstBaseSink *base_sink)
 {
     GstVaapiSink * const sink = GST_VAAPISINK(base_sink);
 
-    return gst_vaapi_ensure_display(sink, &sink->display);
+    return gst_vaapisink_ensure_display(sink);
 }
 
 static gboolean
@@ -420,7 +443,7 @@ gst_vaapisink_set_caps(GstBaseSink *base_sink, GstCaps *caps)
 
     gst_caps_replace(&sink->caps, caps);
 
-    if (!gst_vaapi_ensure_display(sink, &sink->display))
+    if (!gst_vaapisink_ensure_display(sink))
         return FALSE;
 
     gst_vaapi_display_get_size(sink->display, &display_width, &display_height);
@@ -461,7 +484,7 @@ gst_vaapisink_set_caps(GstBaseSink *base_sink, GstCaps *caps)
     return gst_vaapisink_ensure_render_rect(sink, win_width, win_height);
 }
 
-#if USE_VAAPISINK_GLX
+#if USE_GLX
 static void
 render_background(GstVaapiSink *sink)
 {
@@ -663,12 +686,20 @@ gst_vaapisink_show_frame(GstBaseSink *base_sink, GstBuffer *buffer)
              composition, TRUE))
         GST_WARNING("could not update subtitles");
 
-#if USE_VAAPISINK_GLX
+    switch (sink->display_type) {
-    if (sink->use_glx)
+#if USE_GLX
+    case GST_VAAPI_DISPLAY_TYPE_GLX:
         success = gst_vaapisink_show_frame_glx(sink, surface, flags);
-    else
+        break;
 #endif
+    case GST_VAAPI_DISPLAY_TYPE_X11:
         success = gst_vaapisink_show_frame_x11(sink, surface, flags);
+        break;
+    default:
+        GST_ERROR("unsupported display type %d", sink->display_type);
+        success = FALSE;
+        break;
+    }
     return success ? GST_FLOW_OK : GST_FLOW_UNEXPECTED;
 }
 
@@ -699,8 +730,8 @@ gst_vaapisink_set_property(
     GstVaapiSink * const sink = GST_VAAPISINK(object);
 
     switch (prop_id) {
-    case PROP_USE_GLX:
+    case PROP_DISPLAY_TYPE:
-        sink->use_glx = g_value_get_boolean(value);
+        sink->display_type = g_value_get_enum(value);
         break;
     case PROP_FULLSCREEN:
         sink->fullscreen = g_value_get_boolean(value);
@@ -728,8 +759,8 @@ gst_vaapisink_get_property(
     GstVaapiSink * const sink = GST_VAAPISINK(object);
 
     switch (prop_id) {
-    case PROP_USE_GLX:
+    case PROP_DISPLAY_TYPE:
-        g_value_set_boolean(value, sink->use_glx);
+        g_value_set_enum(value, sink->display_type);
         break;
     case PROP_FULLSCREEN:
         g_value_set_boolean(value, sink->fullscreen);
@@ -780,16 +811,17 @@ gst_vaapisink_class_init(GstVaapiSinkClass *klass)
     gst_element_class_add_pad_template(element_class, pad_template);
     gst_object_unref(pad_template);
 
-#if USE_VAAPISINK_GLX
     g_object_class_install_property
         (object_class,
-         PROP_USE_GLX,
+         PROP_DISPLAY_TYPE,
-         g_param_spec_boolean("use-glx",
+         g_param_spec_enum("display",
-                              "GLX rendering",
+                           "display type",
-                              "Enables GLX rendering",
+                           "display type to use",
-                              TRUE,
+                           GST_VAAPI_TYPE_DISPLAY_TYPE,
-                              G_PARAM_READWRITE));
+                           GST_VAAPI_DISPLAY_TYPE_AUTO,
+                           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+#if USE_GLX
     g_object_class_install_property
         (object_class,
          PROP_USE_REFLECTION,
@@ -841,6 +873,6 @@ gst_vaapisink_init(GstVaapiSink *sink)
     sink->foreign_window = FALSE;
     sink->fullscreen     = FALSE;
     sink->synchronous    = FALSE;
-    sink->use_glx        = USE_VAAPISINK_GLX;
+    sink->display_type   = DEFAULT_DISPLAY_TYPE;
     sink->use_reflection = FALSE;
 }

gst/vaapi/gstvaapisink.h

@@ -26,10 +26,10 @@
 #include <gst/video/gstvideosink.h>
 #include <gst/vaapi/gstvaapidisplay.h>
 #include <gst/vaapi/gstvaapiwindow.h>
-#if USE_VAAPISINK_GLX
+#if USE_GLX
 #include <gst/vaapi/gstvaapitexture.h>
 #endif
-#include <X11/Xlib.h>
+#include "gstvaapipluginutil.h"
 
 G_BEGIN_DECLS
 
@@ -59,10 +59,7 @@ G_BEGIN_DECLS
 
 typedef struct _GstVaapiSink                    GstVaapiSink;
 typedef struct _GstVaapiSinkClass               GstVaapiSinkClass;
-
-#if !USE_VAAPISINK_GLX
 typedef struct _GstVaapiTexture                 GstVaapiTexture;
-#endif
 
 struct _GstVaapiSink {
     /*< private >*/
@@ -70,6 +67,7 @@ struct _GstVaapiSink {
 
     GstCaps            *caps;
     GstVaapiDisplay    *display;
+    GstVaapiDisplayType display_type;
     GstVaapiWindow     *window;
     guint               window_width;
     guint               window_height;
@@ -82,7 +80,6 @@ struct _GstVaapiSink {
     guint               foreign_window  : 1;
     guint               fullscreen      : 1;
     guint               synchronous     : 1;
-    guint               use_glx         : 1;
     guint               use_reflection  : 1;
 };