mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-20 04:56:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

filter: fix VA-API 0.34.0 symbol guards.

Browse source 
VASurfaceAttrib and VAProcFilterParameterBufferType are symbols
that need to be guarded for libva 0.34 and 0.33, respectively.

https://bugzilla.gnome.org/show_bug.cgi?id=709102

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
This commit is contained in:
Víctor Manuel Jáquez Leal 2013-09-30 17:08:12 +02:00 committed by Gwenole Beauchesne
parent 395260f24b
commit 94b554e7a2
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst-libs/gst/vaapi/gstvaapifilter.c
View file

@ -657,6 +657,7 @@ find_operation(GstVaapiFilter *filter, GstVaapiFilterOp op)
} }
/* Ensure the operation's VA buffer is allocated */ /* Ensure the operation's VA buffer is allocated */
#if USE_VA_VPP
static inline gboolean static inline gboolean
op_ensure_buffer(GstVaapiFilter *filter, GstVaapiFilterOpData *op_data) op_ensure_buffer(GstVaapiFilter *filter, GstVaapiFilterOpData *op_data)
{ {
@ -666,6 +667,7 @@ op_ensure_buffer(GstVaapiFilter *filter, GstVaapiFilterOpData *op_data)
VAProcFilterParameterBufferType, op_data->va_buffer_size, NULL, VAProcFilterParameterBufferType, op_data->va_buffer_size, NULL,
&op_data->va_buffer, NULL); &op_data->va_buffer, NULL);
} }
#endif
/* Update a generic filter (float value) */ /* Update a generic filter (float value) */
#if USE_VA_VPP #if USE_VA_VPP
@ -822,6 +824,7 @@ op_set_deinterlace(GstVaapiFilter *filter, GstVaapiFilterOpData *op_data,
static GArray * static GArray *
ensure_formats(GstVaapiFilter *filter) ensure_formats(GstVaapiFilter *filter)
{ {
#if VA_CHECK_VERSION(0,34,0)
VASurfaceAttrib *surface_attribs = NULL; VASurfaceAttrib *surface_attribs = NULL;
guint i, num_surface_attribs = 0; guint i, num_surface_attribs = 0;
VAStatus va_status; VAStatus va_status;
@ -829,7 +832,6 @@ ensure_formats(GstVaapiFilter *filter)
if (G_LIKELY(filter->formats)) if (G_LIKELY(filter->formats))
return filter->formats; return filter->formats;
#if VA_CHECK_VERSION(0,34,0)
GST_VAAPI_DISPLAY_LOCK(filter->display); GST_VAAPI_DISPLAY_LOCK(filter->display);
va_status = vaQuerySurfaceAttributes(filter->va_display, filter->va_config, va_status = vaQuerySurfaceAttributes(filter->va_display, filter->va_config,
NULL, &num_surface_attribs); NULL, &num_surface_attribs);
@ -868,13 +870,13 @@ ensure_formats(GstVaapiFilter *filter)
continue; continue;
g_array_append_val(filter->formats, format); g_array_append_val(filter->formats, format);
} }
#endif
g_free(surface_attribs); g_free(surface_attribs);
return filter->formats; return filter->formats;
error: error:
g_free(surface_attribs); g_free(surface_attribs);
#endif
return NULL; return NULL;
} }