mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-10 03:19:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs: fix build error

Browse source 
gst_vaapi_buffer_proxy_{acquire_handle,release_handle,finalize,class}
functions are used only when libva's API version is greater than 0.36.0

This patch guards those functions completely rather than just their
content. The patch is a continuation of commit 38f8fea4

Original-patch-by: Vineeth TM <vineeth.tm@samsung.com>

https://bugzilla.gnome.org/show_bug.cgi?id=762055
This commit is contained in:
Víctor Manuel Jáquez Leal 2016-02-15 18:00:49 +01:00
parent ba701d5918
commit 60ebfbc595
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst-libs/gst/vaapi/gstvaapibufferproxy.c
View file

@ -77,10 +77,10 @@ to_GstVaapiBufferMemoryType (guint va_type)
return type; return type;
} }
#if VA_CHECK_VERSION (0,36,0)
static gboolean static gboolean
gst_vaapi_buffer_proxy_acquire_handle (GstVaapiBufferProxy * proxy) gst_vaapi_buffer_proxy_acquire_handle (GstVaapiBufferProxy * proxy)
{ {
#if VA_CHECK_VERSION (0,36,0)
const guint mem_type = proxy->va_info.mem_type; const guint mem_type = proxy->va_info.mem_type;
VAStatus va_status; VAStatus va_status;
@ -99,15 +99,12 @@ gst_vaapi_buffer_proxy_acquire_handle (GstVaapiBufferProxy * proxy)
if (proxy->va_info.mem_type != mem_type) if (proxy->va_info.mem_type != mem_type)
return FALSE; return FALSE;
return TRUE; return TRUE;
#else
return FALSE;
#endif
} }
/* VA_CHECK_VERSION (0,36,0) */
static gboolean static gboolean
gst_vaapi_buffer_proxy_release_handle (GstVaapiBufferProxy * proxy) gst_vaapi_buffer_proxy_release_handle (GstVaapiBufferProxy * proxy)
{ {
#if VA_CHECK_VERSION (0,36,0)
VAStatus va_status; VAStatus va_status;
if (!proxy->va_info.handle) if (!proxy->va_info.handle)
@ -123,11 +120,9 @@ gst_vaapi_buffer_proxy_release_handle (GstVaapiBufferProxy * proxy)
if (!vaapi_check_status (va_status, "vaReleaseBufferHandle()")) if (!vaapi_check_status (va_status, "vaReleaseBufferHandle()"))
return FALSE; return FALSE;
return TRUE; return TRUE;
#else
return FALSE;
#endif
} }
/* VA_CHECK_VERSION (0,36,0) */
static void static void
gst_vaapi_buffer_proxy_finalize (GstVaapiBufferProxy * proxy) gst_vaapi_buffer_proxy_finalize (GstVaapiBufferProxy * proxy)
{ {
@ -140,6 +135,7 @@ gst_vaapi_buffer_proxy_finalize (GstVaapiBufferProxy * proxy)
gst_vaapi_object_replace (&proxy->parent, NULL); gst_vaapi_object_replace (&proxy->parent, NULL);
} }
/* VA_CHECK_VERSION (0,36,0) */
static inline const GstVaapiMiniObjectClass * static inline const GstVaapiMiniObjectClass *
gst_vaapi_buffer_proxy_class (void) gst_vaapi_buffer_proxy_class (void)
{ {
@ -149,6 +145,7 @@ gst_vaapi_buffer_proxy_class (void)
}; };
return &GstVaapiBufferProxyClass; return &GstVaapiBufferProxyClass;
} }
#endif
GstVaapiBufferProxy * GstVaapiBufferProxy *
gst_vaapi_buffer_proxy_new (guintptr handle, guint type, gsize size, gst_vaapi_buffer_proxy_new (guintptr handle, guint type, gsize size,