summaryrefslogtreecommitdiff
path: root/gst-libs
diff options
context:
space:
mode:
authorNicolas Dufresne <nicolas.dufresne@collabora.co.uk>2011-11-04 17:16:23 -0400
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>2011-12-08 14:58:58 +0100
commit075374cda3a9b08bb77babb4aaef43402921527d (patch)
tree1aa992f8934a6a27558c9b90a54b8a00340d07c5 /gst-libs
parent99c5d18f412a6f42d6bbf9b931675b8597a1539f (diff)
Change caps to use new video/x-surface generic type.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Diffstat (limited to 'gst-libs')
-rw-r--r--gst-libs/gst/vaapi/Makefile.am3
-rw-r--r--gst-libs/gst/vaapi/gstvaapicontext.c3
-rw-r--r--gst-libs/gst/vaapi/gstvaapisurface.h14
3 files changed, 13 insertions, 7 deletions
diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am
index 17ead8b3..a68e0456 100644
--- 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 b5c40924..2ab62bb9 100644
--- 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 bc513f7d..05dffcfd 100644
--- 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 ]"
/**