Change caps to use new video/x-surface generic type.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>

diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am
index 17ead8b308d57bbc5651bbdd570a5f4e387d728b..a68e04561d57504c4e75706911343f0196fe2828 100644 (file)
--- a/gst-libs/gst/vaapi/Makefile.am
+++ b/gst-libs/gst/vaapi/Makefile.am
@@ -134,6 +134,7 @@ libgstvaapi_@GST_MAJORMINOR@includedir =    \
        $(libgstvaapi_includedir)
 
 libgstvaapi_@GST_MAJORMINOR@_la_CFLAGS =       \
+       -DGST_USE_UNSTABLE_API                  \
        -I$(top_srcdir)/gst-libs                \
        $(GST_BASE_CFLAGS)                      \
        $(GST_CFLAGS)                           \
@@ -165,6 +166,7 @@ libgstvaapi_x11_@GST_MAJORMINOR@includedir =        \
        $(libgstvaapi_includedir)
 
 libgstvaapi_x11_@GST_MAJORMINOR@_la_CFLAGS =   \
+       -DGST_USE_UNSTABLE_API                  \
        -I$(top_srcdir)/gst-libs                \
        $(GLIB_CFLAGS)                          \
        $(GST_BASE_CFLAGS)                      \
@@ -196,6 +198,7 @@ libgstvaapi_glx_@GST_MAJORMINOR@includedir =        \
        $(libgstvaapi_includedir)
 
 libgstvaapi_glx_@GST_MAJORMINOR@_la_CFLAGS =   \
+       -DGST_USE_UNSTABLE_API                  \
        -I$(top_srcdir)/gst-libs                \
        $(GLIB_CFLAGS)                          \
        $(GST_BASE_CFLAGS)                      \

diff --git a/gst-libs/gst/vaapi/gstvaapicontext.c b/gst-libs/gst/vaapi/gstvaapicontext.c
index b5c409240e46b5b15f4404ae60f96966069f54d7..2ab62bb953351497ef7491b4af2e1c20680a41a5 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapicontext.c
+++ b/gst-libs/gst/vaapi/gstvaapicontext.c
@@ -143,7 +143,8 @@ gst_vaapi_context_create_surfaces(GstVaapiContext *context)
 
     if (!priv->surfaces_pool) {
         caps = gst_caps_new_simple(
-            "video/x-vaapi-surface",
+            GST_VAAPI_SURFACE_CAPS_NAME,
+            "type", G_TYPE_STRING, "vaapi",
             "width",  G_TYPE_INT, priv->width,
             "height", G_TYPE_INT, priv->height,
             NULL

diff --git a/gst-libs/gst/vaapi/gstvaapisurface.h b/gst-libs/gst/vaapi/gstvaapisurface.h
index bc513f7da7e03b07dfac1a500fcff9ce1cbb3fee..05dffcfdcecea99f775c302febd22a4f34617c5c 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapisurface.h
+++ b/gst-libs/gst/vaapi/gstvaapisurface.h
@@ -27,6 +27,7 @@
 #include <gst/vaapi/gstvaapidisplay.h>
 #include <gst/vaapi/gstvaapiimage.h>
 #include <gst/vaapi/gstvaapisubpicture.h>
+#include <gst/video/gstsurfacebuffer.h>
 
 G_BEGIN_DECLS
 
@@ -39,18 +40,19 @@ typedef enum _GstVaapiSurfaceRenderFlags        GstVaapiSurfaceRenderFlags;
  *
  * Generic caps type for VA surfaces.
  */
-#define GST_VAAPI_SURFACE_CAPS_NAME     \
-    "video/x-vaapi-surface"
+#define GST_VAAPI_SURFACE_CAPS_NAME GST_VIDEO_CAPS_SURFACE
 
 /**
  * GST_VAAPI_SURFACE_CAPS:
  *
  * Generic caps for VA surfaces.
  */
-#define GST_VAAPI_SURFACE_CAPS          \
-    GST_VAAPI_SURFACE_CAPS_NAME ", "    \
-    "width  = (int) [ 1, MAX ],"        \
-    "height = (int) [ 1, MAX ],"        \
+#define GST_VAAPI_SURFACE_CAPS                  \
+    GST_VAAPI_SURFACE_CAPS_NAME ", "            \
+    "type = vaapi, "                            \
+    "opengl = (boolean) { true, false }, "      \
+    "width  = (int) [ 1, MAX ], "               \
+    "height = (int) [ 1, MAX ], "               \
     "framerate = (fraction) [ 0, MAX ]"
 
 /**

diff --git a/gst/vaapi/gstvaapiconvert.c b/gst/vaapi/gstvaapiconvert.c
index f8719403bc5cbce9526a9b713701397157f1324f..1574de78fee4042958ab439893002346dacfe1e2 100644 (file)
--- a/gst/vaapi/gstvaapiconvert.c
+++ b/gst/vaapi/gstvaapiconvert.c
@@ -462,7 +462,7 @@ gst_vaapiconvert_transform_caps(
         out_caps = gst_caps_from_string(gst_vaapiconvert_vaapi_caps_str);
     }
     else {
-        if (!gst_structure_has_name(structure, "video/x-vaapi-surface"))
+        if (!gst_structure_has_name(structure, GST_VAAPI_SURFACE_CAPS_NAME))
             return NULL;
         out_caps = gst_caps_from_string(gst_vaapiconvert_yuv_caps_str);
         if (convert->display) {
@@ -667,7 +667,7 @@ gst_vaapiconvert_get_unit_size(
     GstVideoFormat format;
     gint width, height;
 
-    if (gst_structure_has_name(structure, "video/x-vaapi-surface"))
+    if (gst_structure_has_name(structure, GST_VAAPI_SURFACE_CAPS_NAME))
         *size = 0;
     else {
         if (!gst_video_format_parse_caps(caps, &format, &width, &height))

diff --git a/gst/vaapi/gstvaapisink.c b/gst/vaapi/gstvaapisink.c
index b2477c3e873e16479dc3548789fbaeb64addacd6..067e2f0ec6091fb17383ab33cfe1d3ee054a869d 100644 (file)
--- a/gst/vaapi/gstvaapisink.c
+++ b/gst/vaapi/gstvaapisink.c
@@ -499,7 +499,7 @@ gst_vaapisink_buffer_alloc(
         goto error_ensure_display;
 
     structure = gst_caps_get_structure(caps, 0);
-    if (!gst_structure_has_name(structure, "video/x-vaapi-surface"))
+    if (!gst_structure_has_name(structure, GST_VAAPI_SURFACE_CAPS_NAME))
         goto error_invalid_caps;
 
     buffer = gst_vaapi_video_buffer_new(sink->display);

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ba6490ab38c3a768c10ef0daf788208bec3c8f44..8a27305557b99afbbaa7ac5687c823e4d00a77ed 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,7 +11,7 @@ noinst_PROGRAMS +=    \
        $(NULL)
 endif
 
-TEST_CFLAGS            = $(LIBVA_CFLAGS) -I$(top_srcdir)/gst-libs $(GST_CFLAGS)
+TEST_CFLAGS            = $(LIBVA_CFLAGS) -I$(top_srcdir)/gst-libs $(GST_CFLAGS) -DGST_USE_UNSTABLE_API
 TEST_X11_CFLAGS                = -DUSE_X11 $(X11_CFLAGS)
 TEST_GLX_CFLAGS                = -DUSE_GLX $(GLX_CFLAGS)
 TEST_MIX_CFLAGS                = $(TEST_X11_CFLAGS)

diff --git a/tests/test-surfaces.c b/tests/test-surfaces.c
index 9cd23e334dfaa7890298b03da0e8230ce4580923..17e97516c535698f7b5f97cab085b63cfee59259 100644 (file)
--- a/tests/test-surfaces.c
+++ b/tests/test-surfaces.c
@@ -66,7 +66,8 @@ main(int argc, char *argv[])
     g_object_unref(surface);
 
     caps = gst_caps_new_simple(
-        "video/x-vaapi-surface",
+        GST_VAAPI_SURFACE_CAPS_NAME,
+        "type", G_TYPE_STRING, "vaapi",
         "width", G_TYPE_INT, width,
         "height", G_TYPE_INT, height,
         NULL