mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-16 12:25:50 +00:00
Code Issues 1 Projects Releases Wiki Activity

surfaceproxy: re-indent all GstVaapiSurfaceProxy related source code.

Browse source
This commit is contained in:
Gwenole Beauchesne 2015-01-23 16:37:06 +01:00
parent 74a080a8da
commit 1810a41c68
3 changed files with 158 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

127
gst-libs/gst/vaapi/gstvaapisurfaceproxy.c
View file

@ -36,28 +36,28 @@
#include "gstvaapidebug.h" #include "gstvaapidebug.h"
static void static void
gst_vaapi_surface_proxy_finalize(GstVaapiSurfaceProxy *proxy) gst_vaapi_surface_proxy_finalize (GstVaapiSurfaceProxy * proxy)
{ {
if (proxy->surface) { if (proxy->surface) {
if (proxy->pool && !proxy->parent) if (proxy->pool && !proxy->parent)
gst_vaapi_video_pool_put_object(proxy->pool, proxy->surface); gst_vaapi_video_pool_put_object (proxy->pool, proxy->surface);
gst_vaapi_object_unref(proxy->surface); gst_vaapi_object_unref (proxy->surface);
proxy->surface = NULL; proxy->surface = NULL;
} }
gst_vaapi_video_pool_replace(&proxy->pool, NULL); gst_vaapi_video_pool_replace (&proxy->pool, NULL);
gst_vaapi_surface_proxy_replace(&proxy->parent, NULL); gst_vaapi_surface_proxy_replace (&proxy->parent, NULL);
/* Notify the user function that the object is now destroyed */ /* Notify the user function that the object is now destroyed */
if (proxy->destroy_func) if (proxy->destroy_func)
proxy->destroy_func(proxy->destroy_data); proxy->destroy_func (proxy->destroy_data);
} }
static inline const GstVaapiMiniObjectClass * static inline const GstVaapiMiniObjectClass *
gst_vaapi_surface_proxy_class(void) gst_vaapi_surface_proxy_class (void)
{ {
static const GstVaapiMiniObjectClass GstVaapiSurfaceProxyClass = { static const GstVaapiMiniObjectClass GstVaapiSurfaceProxyClass = {
sizeof(GstVaapiSurfaceProxy), sizeof (GstVaapiSurfaceProxy),
(GDestroyNotify)gst_vaapi_surface_proxy_finalize (GDestroyNotify) gst_vaapi_surface_proxy_finalize
}; };
return &GstVaapiSurfaceProxyClass; return &GstVaapiSurfaceProxyClass;
} }
@ -74,36 +74,35 @@ gst_vaapi_surface_proxy_class(void)
* Returns: The same newly allocated @proxy object, or %NULL on error * Returns: The same newly allocated @proxy object, or %NULL on error
*/ */
GstVaapiSurfaceProxy * GstVaapiSurfaceProxy *
gst_vaapi_surface_proxy_new_from_pool(GstVaapiSurfacePool *pool) gst_vaapi_surface_proxy_new_from_pool (GstVaapiSurfacePool * pool)
{ {
GstVaapiSurfaceProxy *proxy; GstVaapiSurfaceProxy *proxy;
g_return_val_if_fail(pool != NULL, NULL); g_return_val_if_fail (pool != NULL, NULL);
proxy = (GstVaapiSurfaceProxy *) proxy = (GstVaapiSurfaceProxy *)
gst_vaapi_mini_object_new(gst_vaapi_surface_proxy_class()); gst_vaapi_mini_object_new (gst_vaapi_surface_proxy_class ());
if (!proxy) if (!proxy)
return NULL; return NULL;
proxy->parent = NULL; proxy->parent = NULL;
proxy->destroy_func = NULL; proxy->destroy_func = NULL;
proxy->pool = gst_vaapi_video_pool_ref(pool); proxy->pool = gst_vaapi_video_pool_ref (pool);
proxy->surface = gst_vaapi_video_pool_get_object(proxy->pool); proxy->surface = gst_vaapi_video_pool_get_object (proxy->pool);
if (!proxy->surface) if (!proxy->surface)
goto error; goto error;
proxy->view_id = 0; proxy->view_id = 0;
proxy->timestamp = GST_CLOCK_TIME_NONE; proxy->timestamp = GST_CLOCK_TIME_NONE;
proxy->duration = GST_CLOCK_TIME_NONE; proxy->duration = GST_CLOCK_TIME_NONE;
proxy->has_crop_rect = FALSE; proxy->has_crop_rect = FALSE;
gst_vaapi_object_ref(proxy->surface); gst_vaapi_object_ref (proxy->surface);
return proxy; return proxy;
error: error:
gst_vaapi_surface_proxy_unref(proxy); gst_vaapi_surface_proxy_unref (proxy);
return NULL; return NULL;
} }
/** /**
* gst_vaapi_surface_proxy_copy: * gst_vaapi_surface_proxy_copy:
* @proxy: the parent #GstVaapiSurfaceProxy * @proxy: the parent #GstVaapiSurfaceProxy
@ -118,24 +117,23 @@ error:
* Returns: The same newly allocated @proxy object, or %NULL on error * Returns: The same newly allocated @proxy object, or %NULL on error
*/ */
GstVaapiSurfaceProxy * GstVaapiSurfaceProxy *
gst_vaapi_surface_proxy_copy(GstVaapiSurfaceProxy *proxy) gst_vaapi_surface_proxy_copy (GstVaapiSurfaceProxy * proxy)
{ {
GstVaapiSurfaceProxy *copy; GstVaapiSurfaceProxy *copy;
g_return_val_if_fail(proxy != NULL, NULL); g_return_val_if_fail (proxy != NULL, NULL);
copy = (GstVaapiSurfaceProxy *) copy = (GstVaapiSurfaceProxy *)
gst_vaapi_mini_object_new(gst_vaapi_surface_proxy_class()); gst_vaapi_mini_object_new (gst_vaapi_surface_proxy_class ());
if (!copy) if (!copy)
return NULL; return NULL;
GST_VAAPI_SURFACE_PROXY_FLAGS(copy) = GST_VAAPI_SURFACE_PROXY_FLAGS (copy) = GST_VAAPI_SURFACE_PROXY_FLAGS (proxy);
GST_VAAPI_SURFACE_PROXY_FLAGS(proxy);
copy->parent = gst_vaapi_surface_proxy_ref(proxy->parent ? copy->parent = gst_vaapi_surface_proxy_ref (proxy->parent ?
proxy->parent : proxy); proxy->parent : proxy);
copy->pool = gst_vaapi_video_pool_ref(proxy->pool); copy->pool = gst_vaapi_video_pool_ref (proxy->pool);
copy->surface = gst_vaapi_object_ref(proxy->surface); copy->surface = gst_vaapi_object_ref (proxy->surface);
copy->view_id = proxy->view_id; copy->view_id = proxy->view_id;
copy->timestamp = proxy->timestamp; copy->timestamp = proxy->timestamp;
copy->duration = proxy->duration; copy->duration = proxy->duration;
@ -155,12 +153,13 @@ gst_vaapi_surface_proxy_copy(GstVaapiSurfaceProxy *proxy)
* Returns: The same @proxy argument * Returns: The same @proxy argument
*/ */
GstVaapiSurfaceProxy * GstVaapiSurfaceProxy *
gst_vaapi_surface_proxy_ref(GstVaapiSurfaceProxy *proxy) gst_vaapi_surface_proxy_ref (GstVaapiSurfaceProxy * proxy)
{ {
g_return_val_if_fail(proxy != NULL, NULL); g_return_val_if_fail (proxy != NULL, NULL);
return GST_VAAPI_SURFACE_PROXY(gst_vaapi_mini_object_ref( return
GST_VAAPI_MINI_OBJECT(proxy))); GST_VAAPI_SURFACE_PROXY (gst_vaapi_mini_object_ref (GST_VAAPI_MINI_OBJECT
(proxy)));
} }
/** /**
@ -171,11 +170,11 @@ gst_vaapi_surface_proxy_ref(GstVaapiSurfaceProxy *proxy)
* the reference count reaches zero, the object will be free'd. * the reference count reaches zero, the object will be free'd.
*/ */
void void
gst_vaapi_surface_proxy_unref(GstVaapiSurfaceProxy *proxy) gst_vaapi_surface_proxy_unref (GstVaapiSurfaceProxy * proxy)
{ {
g_return_if_fail(proxy != NULL); g_return_if_fail (proxy != NULL);
gst_vaapi_mini_object_unref(GST_VAAPI_MINI_OBJECT(proxy)); gst_vaapi_mini_object_unref (GST_VAAPI_MINI_OBJECT (proxy));
} }
/** /**
@ -188,13 +187,13 @@ gst_vaapi_surface_proxy_unref(GstVaapiSurfaceProxy *proxy)
* object. However, @new_proxy can be NULL. * object. However, @new_proxy can be NULL.
*/ */
void void
gst_vaapi_surface_proxy_replace(GstVaapiSurfaceProxy **old_proxy_ptr, gst_vaapi_surface_proxy_replace (GstVaapiSurfaceProxy ** old_proxy_ptr,
GstVaapiSurfaceProxy *new_proxy) GstVaapiSurfaceProxy * new_proxy)
{ {
g_return_if_fail(old_proxy_ptr != NULL); g_return_if_fail (old_proxy_ptr != NULL);
gst_vaapi_mini_object_replace((GstVaapiMiniObject **)old_proxy_ptr, gst_vaapi_mini_object_replace ((GstVaapiMiniObject **) old_proxy_ptr,
GST_VAAPI_MINI_OBJECT(new_proxy)); GST_VAAPI_MINI_OBJECT (new_proxy));
} }
/** /**
@ -206,11 +205,11 @@ gst_vaapi_surface_proxy_replace(GstVaapiSurfaceProxy **old_proxy_ptr,
* Return value: the #GstVaapiSurface * Return value: the #GstVaapiSurface
*/ */
GstVaapiSurface * GstVaapiSurface *
gst_vaapi_surface_proxy_get_surface(GstVaapiSurfaceProxy *proxy) gst_vaapi_surface_proxy_get_surface (GstVaapiSurfaceProxy * proxy)
{ {
g_return_val_if_fail(proxy != NULL, NULL); g_return_val_if_fail (proxy != NULL, NULL);
return GST_VAAPI_SURFACE_PROXY_SURFACE(proxy); return GST_VAAPI_SURFACE_PROXY_SURFACE (proxy);
} }
/** /**
@ -223,11 +222,11 @@ gst_vaapi_surface_proxy_get_surface(GstVaapiSurfaceProxy *proxy)
* Return value: the set of #GstVaapiSurfaceProxyFlags * Return value: the set of #GstVaapiSurfaceProxyFlags
*/ */
guint guint
gst_vaapi_surface_proxy_get_flags(GstVaapiSurfaceProxy *proxy) gst_vaapi_surface_proxy_get_flags (GstVaapiSurfaceProxy * proxy)
{ {
g_return_val_if_fail(proxy != NULL, 0); g_return_val_if_fail (proxy != NULL, 0);
return GST_VAAPI_SURFACE_PROXY_FLAGS(proxy); return GST_VAAPI_SURFACE_PROXY_FLAGS (proxy);
} }
/** /**
@ -239,12 +238,12 @@ gst_vaapi_surface_proxy_get_flags(GstVaapiSurfaceProxy *proxy)
* Return value: the #GstVaapiID * Return value: the #GstVaapiID
*/ */
GstVaapiID GstVaapiID
gst_vaapi_surface_proxy_get_surface_id(GstVaapiSurfaceProxy *proxy) gst_vaapi_surface_proxy_get_surface_id (GstVaapiSurfaceProxy * proxy)
{ {
g_return_val_if_fail(proxy != NULL, VA_INVALID_ID); g_return_val_if_fail (proxy != NULL, VA_INVALID_ID);
g_return_val_if_fail(proxy->surface != NULL, VA_INVALID_ID); g_return_val_if_fail (proxy->surface != NULL, VA_INVALID_ID);
return GST_VAAPI_SURFACE_PROXY_SURFACE_ID(proxy); return GST_VAAPI_SURFACE_PROXY_SURFACE_ID (proxy);
} }
/** /**
@ -256,11 +255,11 @@ gst_vaapi_surface_proxy_get_surface_id(GstVaapiSurfaceProxy *proxy)
* Return value: the #GstVaapiID * Return value: the #GstVaapiID
*/ */
guintptr guintptr
gst_vaapi_surface_proxy_get_view_id(GstVaapiSurfaceProxy *proxy) gst_vaapi_surface_proxy_get_view_id (GstVaapiSurfaceProxy * proxy)
{ {
g_return_val_if_fail(proxy != NULL, 0); g_return_val_if_fail (proxy != NULL, 0);
return GST_VAAPI_SURFACE_PROXY_VIEW_ID(proxy); return GST_VAAPI_SURFACE_PROXY_VIEW_ID (proxy);
} }
/** /**
@ -272,11 +271,11 @@ gst_vaapi_surface_proxy_get_view_id(GstVaapiSurfaceProxy *proxy)
* Return value: the presentation timestamp * Return value: the presentation timestamp
*/ */
GstClockTime GstClockTime
gst_vaapi_surface_proxy_get_timestamp(GstVaapiSurfaceProxy *proxy) gst_vaapi_surface_proxy_get_timestamp (GstVaapiSurfaceProxy * proxy)
{ {
g_return_val_if_fail(proxy != NULL, 0); g_return_val_if_fail (proxy != NULL, 0);
return GST_VAAPI_SURFACE_PROXY_TIMESTAMP(proxy); return GST_VAAPI_SURFACE_PROXY_TIMESTAMP (proxy);
} }
/** /**
@ -288,11 +287,11 @@ gst_vaapi_surface_proxy_get_timestamp(GstVaapiSurfaceProxy *proxy)
* Return value: the presentation duration * Return value: the presentation duration
*/ */
GstClockTime GstClockTime
gst_vaapi_surface_proxy_get_duration(GstVaapiSurfaceProxy *proxy) gst_vaapi_surface_proxy_get_duration (GstVaapiSurfaceProxy * proxy)
{ {
g_return_val_if_fail(proxy != NULL, 0); g_return_val_if_fail (proxy != NULL, 0);
return GST_VAAPI_SURFACE_PROXY_DURATION(proxy); return GST_VAAPI_SURFACE_PROXY_DURATION (proxy);
} }
/** /**
@ -307,10 +306,10 @@ gst_vaapi_surface_proxy_get_duration(GstVaapiSurfaceProxy *proxy)
* the callback function shall not expect anything from that. * the callback function shall not expect anything from that.
*/ */
void void
gst_vaapi_surface_proxy_set_destroy_notify(GstVaapiSurfaceProxy *proxy, gst_vaapi_surface_proxy_set_destroy_notify (GstVaapiSurfaceProxy * proxy,
GDestroyNotify destroy_func, gpointer user_data) GDestroyNotify destroy_func, gpointer user_data)
{ {
g_return_if_fail(proxy != NULL); g_return_if_fail (proxy != NULL);
proxy->destroy_func = destroy_func; proxy->destroy_func = destroy_func;
proxy->destroy_data = user_data; proxy->destroy_data = user_data;
@ -331,11 +330,11 @@ gst_vaapi_surface_proxy_set_destroy_notify(GstVaapiSurfaceProxy *proxy,
* associated with the surface proxy * associated with the surface proxy
*/ */
const GstVaapiRectangle * const GstVaapiRectangle *
gst_vaapi_surface_proxy_get_crop_rect(GstVaapiSurfaceProxy *proxy) gst_vaapi_surface_proxy_get_crop_rect (GstVaapiSurfaceProxy * proxy)
{ {
g_return_val_if_fail(proxy != NULL, NULL); g_return_val_if_fail (proxy != NULL, NULL);
return GST_VAAPI_SURFACE_PROXY_CROP_RECT(proxy); return GST_VAAPI_SURFACE_PROXY_CROP_RECT (proxy);
} }
/** /**
@ -346,10 +345,10 @@ gst_vaapi_surface_proxy_get_crop_rect(GstVaapiSurfaceProxy *proxy)
* Associates the @crop_rect with the @proxy * Associates the @crop_rect with the @proxy
*/ */
void void
gst_vaapi_surface_proxy_set_crop_rect(GstVaapiSurfaceProxy *proxy, gst_vaapi_surface_proxy_set_crop_rect (GstVaapiSurfaceProxy * proxy,
const GstVaapiRectangle *crop_rect) const GstVaapiRectangle * crop_rect)
{ {
g_return_if_fail(proxy != NULL); g_return_if_fail (proxy != NULL);
proxy->has_crop_rect = crop_rect != NULL; proxy->has_crop_rect = crop_rect != NULL;
if (proxy->has_crop_rect) if (proxy->has_crop_rect)

45
gst-libs/gst/vaapi/gstvaapisurfaceproxy.h
View file

@ -42,7 +42,8 @@ G_BEGIN_DECLS
* *
* Flags for #GstVaapiDecoderFrame. * Flags for #GstVaapiDecoderFrame.
*/ */
typedef enum { typedef enum
{
GST_VAAPI_SURFACE_PROXY_FLAG_INTERLACED = (1 << 0), GST_VAAPI_SURFACE_PROXY_FLAG_INTERLACED = (1 << 0),
GST_VAAPI_SURFACE_PROXY_FLAG_TFF = (1 << 1), GST_VAAPI_SURFACE_PROXY_FLAG_TFF = (1 << 1),
GST_VAAPI_SURFACE_PROXY_FLAG_RFF = (1 << 2), GST_VAAPI_SURFACE_PROXY_FLAG_RFF = (1 << 2),
@ -58,7 +59,7 @@ typedef enum {
* Macro that evaluates to the #GstVaapiSurface of @proxy. * Macro that evaluates to the #GstVaapiSurface of @proxy.
*/ */
#define GST_VAAPI_SURFACE_PROXY_SURFACE(proxy) \ #define GST_VAAPI_SURFACE_PROXY_SURFACE(proxy) \
gst_vaapi_surface_proxy_get_surface(proxy) gst_vaapi_surface_proxy_get_surface (proxy)
/** /**
* GST_VAAPI_SURFACE_PROXY_SURFACE_ID: * GST_VAAPI_SURFACE_PROXY_SURFACE_ID:
@ -68,7 +69,7 @@ typedef enum {
* surface. * surface.
*/ */
#define GST_VAAPI_SURFACE_PROXY_SURFACE_ID(proxy) \ #define GST_VAAPI_SURFACE_PROXY_SURFACE_ID(proxy) \
gst_vaapi_surface_proxy_get_surface_id(proxy) gst_vaapi_surface_proxy_get_surface_id (proxy)
/** /**
* GST_VAAPI_SURFACE_PROXY_VIEW_ID: * GST_VAAPI_SURFACE_PROXY_VIEW_ID:
@ -78,7 +79,7 @@ typedef enum {
* surface. * surface.
*/ */
#define GST_VAAPI_SURFACE_PROXY_VIEW_ID(proxy) \ #define GST_VAAPI_SURFACE_PROXY_VIEW_ID(proxy) \
gst_vaapi_surface_proxy_get_view_id(proxy) gst_vaapi_surface_proxy_get_view_id (proxy)
/** /**
* GST_VAAPI_SURFACE_PROXY_TIMESTAMP: * GST_VAAPI_SURFACE_PROXY_TIMESTAMP:
@ -88,7 +89,7 @@ typedef enum {
* underlying @proxy surface. * underlying @proxy surface.
*/ */
#define GST_VAAPI_SURFACE_PROXY_TIMESTAMP(proxy) \ #define GST_VAAPI_SURFACE_PROXY_TIMESTAMP(proxy) \
gst_vaapi_surface_proxy_get_timestamp(proxy) gst_vaapi_surface_proxy_get_timestamp (proxy)
/** /**
* GST_VAAPI_SURFACE_PROXY_DURATION: * GST_VAAPI_SURFACE_PROXY_DURATION:
@ -98,52 +99,52 @@ typedef enum {
* underlying @proxy surface. * underlying @proxy surface.
*/ */
#define GST_VAAPI_SURFACE_PROXY_DURATION(proxy) \ #define GST_VAAPI_SURFACE_PROXY_DURATION(proxy) \
gst_vaapi_surface_proxy_get_duration(proxy) gst_vaapi_surface_proxy_get_duration (proxy)
GstVaapiSurfaceProxy * GstVaapiSurfaceProxy *
gst_vaapi_surface_proxy_new_from_pool(GstVaapiSurfacePool *pool); gst_vaapi_surface_proxy_new_from_pool (GstVaapiSurfacePool * pool);
GstVaapiSurfaceProxy * GstVaapiSurfaceProxy *
gst_vaapi_surface_proxy_copy(GstVaapiSurfaceProxy *proxy); gst_vaapi_surface_proxy_copy (GstVaapiSurfaceProxy * proxy);
GstVaapiSurfaceProxy * GstVaapiSurfaceProxy *
gst_vaapi_surface_proxy_ref(GstVaapiSurfaceProxy *proxy); gst_vaapi_surface_proxy_ref (GstVaapiSurfaceProxy * proxy);
void void
gst_vaapi_surface_proxy_unref(GstVaapiSurfaceProxy *proxy); gst_vaapi_surface_proxy_unref (GstVaapiSurfaceProxy * proxy);
void void
gst_vaapi_surface_proxy_replace(GstVaapiSurfaceProxy **old_proxy_ptr, gst_vaapi_surface_proxy_replace (GstVaapiSurfaceProxy ** old_proxy_ptr,
GstVaapiSurfaceProxy *new_proxy); GstVaapiSurfaceProxy * new_proxy);
guint guint
gst_vaapi_surface_proxy_get_flags(GstVaapiSurfaceProxy *proxy); gst_vaapi_surface_proxy_get_flags (GstVaapiSurfaceProxy * proxy);
GstVaapiSurface * GstVaapiSurface *
gst_vaapi_surface_proxy_get_surface(GstVaapiSurfaceProxy *proxy); gst_vaapi_surface_proxy_get_surface (GstVaapiSurfaceProxy * proxy);
GstVaapiID GstVaapiID
gst_vaapi_surface_proxy_get_surface_id(GstVaapiSurfaceProxy *proxy); gst_vaapi_surface_proxy_get_surface_id (GstVaapiSurfaceProxy * proxy);
guintptr guintptr
gst_vaapi_surface_proxy_get_view_id(GstVaapiSurfaceProxy *proxy); gst_vaapi_surface_proxy_get_view_id (GstVaapiSurfaceProxy * proxy);
GstClockTime GstClockTime
gst_vaapi_surface_proxy_get_timestamp(GstVaapiSurfaceProxy *proxy); gst_vaapi_surface_proxy_get_timestamp (GstVaapiSurfaceProxy * proxy);
GstClockTime GstClockTime
gst_vaapi_surface_proxy_get_duration(GstVaapiSurfaceProxy *proxy); gst_vaapi_surface_proxy_get_duration (GstVaapiSurfaceProxy * proxy);
void void
gst_vaapi_surface_proxy_set_destroy_notify(GstVaapiSurfaceProxy *proxy, gst_vaapi_surface_proxy_set_destroy_notify (GstVaapiSurfaceProxy * proxy,
GDestroyNotify destroy_func, gpointer user_data); GDestroyNotify destroy_func, gpointer user_data);
const GstVaapiRectangle * const GstVaapiRectangle *
gst_vaapi_surface_proxy_get_crop_rect(GstVaapiSurfaceProxy *proxy); gst_vaapi_surface_proxy_get_crop_rect (GstVaapiSurfaceProxy * proxy);
void void
gst_vaapi_surface_proxy_set_crop_rect(GstVaapiSurfaceProxy *proxy, gst_vaapi_surface_proxy_set_crop_rect (GstVaapiSurfaceProxy * proxy,
const GstVaapiRectangle *crop_rect); const GstVaapiRectangle * crop_rect);
G_END_DECLS G_END_DECLS

21
gst-libs/gst/vaapi/gstvaapisurfaceproxy_priv.h
View file

@ -31,9 +31,10 @@
#include "gstvaapisurface_priv.h" #include "gstvaapisurface_priv.h"
#define GST_VAAPI_SURFACE_PROXY(obj) \ #define GST_VAAPI_SURFACE_PROXY(obj) \
((GstVaapiSurfaceProxy *)(obj)) ((GstVaapiSurfaceProxy *) (obj))
struct _GstVaapiSurfaceProxy { struct _GstVaapiSurfaceProxy
{
/*< private >*/ /*< private >*/
GstVaapiMiniObject parent_instance; GstVaapiMiniObject parent_instance;
GstVaapiSurfaceProxy *parent; GstVaapiSurfaceProxy *parent;
@ -46,7 +47,7 @@ struct _GstVaapiSurfaceProxy {
GDestroyNotify destroy_func; GDestroyNotify destroy_func;
gpointer destroy_data; gpointer destroy_data;
GstVaapiRectangle crop_rect; GstVaapiRectangle crop_rect;
guint has_crop_rect : 1; guint has_crop_rect:1;
}; };
#define GST_VAAPI_SURFACE_PROXY_FLAGS GST_VAAPI_MINI_OBJECT_FLAGS #define GST_VAAPI_SURFACE_PROXY_FLAGS GST_VAAPI_MINI_OBJECT_FLAGS
@ -63,7 +64,7 @@ struct _GstVaapiSurfaceProxy {
*/ */
#undef GST_VAAPI_SURFACE_PROXY_SURFACE #undef GST_VAAPI_SURFACE_PROXY_SURFACE
#define GST_VAAPI_SURFACE_PROXY_SURFACE(proxy) \ #define GST_VAAPI_SURFACE_PROXY_SURFACE(proxy) \
GST_VAAPI_SURFACE_PROXY(proxy)->surface (GST_VAAPI_SURFACE_PROXY (proxy)->surface)
/** /**
* GST_VAAPI_SURFACE_PROXY_SURFACE_ID: * GST_VAAPI_SURFACE_PROXY_SURFACE_ID:
@ -76,7 +77,7 @@ struct _GstVaapiSurfaceProxy {
*/ */
#undef GST_VAAPI_SURFACE_PROXY_SURFACE_ID #undef GST_VAAPI_SURFACE_PROXY_SURFACE_ID
#define GST_VAAPI_SURFACE_PROXY_SURFACE_ID(proxy) \ #define GST_VAAPI_SURFACE_PROXY_SURFACE_ID(proxy) \
GST_VAAPI_OBJECT_ID(GST_VAAPI_SURFACE_PROXY(proxy)->surface) (GST_VAAPI_OBJECT_ID (GST_VAAPI_SURFACE_PROXY (proxy)->surface))
/** /**
* GST_VAAPI_SURFACE_PROXY_VIEW_ID: * GST_VAAPI_SURFACE_PROXY_VIEW_ID:
@ -89,7 +90,7 @@ struct _GstVaapiSurfaceProxy {
*/ */
#undef GST_VAAPI_SURFACE_PROXY_VIEW_ID #undef GST_VAAPI_SURFACE_PROXY_VIEW_ID
#define GST_VAAPI_SURFACE_PROXY_VIEW_ID(proxy) \ #define GST_VAAPI_SURFACE_PROXY_VIEW_ID(proxy) \
GST_VAAPI_SURFACE_PROXY(proxy)->view_id (GST_VAAPI_SURFACE_PROXY (proxy)->view_id)
/** /**
* GST_VAAPI_SURFACE_PROXY_TIMESTAMP: * GST_VAAPI_SURFACE_PROXY_TIMESTAMP:
@ -102,7 +103,7 @@ struct _GstVaapiSurfaceProxy {
*/ */
#undef GST_VAAPI_SURFACE_PROXY_TIMESTAMP #undef GST_VAAPI_SURFACE_PROXY_TIMESTAMP
#define GST_VAAPI_SURFACE_PROXY_TIMESTAMP(proxy) \ #define GST_VAAPI_SURFACE_PROXY_TIMESTAMP(proxy) \
GST_VAAPI_SURFACE_PROXY(proxy)->timestamp (GST_VAAPI_SURFACE_PROXY (proxy)->timestamp)
/** /**
* GST_VAAPI_SURFACE_PROXY_DURATION: * GST_VAAPI_SURFACE_PROXY_DURATION:
@ -115,7 +116,7 @@ struct _GstVaapiSurfaceProxy {
*/ */
#undef GST_VAAPI_SURFACE_PROXY_DURATION #undef GST_VAAPI_SURFACE_PROXY_DURATION
#define GST_VAAPI_SURFACE_PROXY_DURATION(proxy) \ #define GST_VAAPI_SURFACE_PROXY_DURATION(proxy) \
GST_VAAPI_SURFACE_PROXY(proxy)->duration (GST_VAAPI_SURFACE_PROXY (proxy)->duration)
/** /**
* GST_VAAPI_SURFACE_PROXY_CROP_RECT: * GST_VAAPI_SURFACE_PROXY_CROP_RECT:
@ -127,7 +128,7 @@ struct _GstVaapiSurfaceProxy {
*/ */
#undef GST_VAAPI_SURFACE_PROXY_CROP_RECT #undef GST_VAAPI_SURFACE_PROXY_CROP_RECT
#define GST_VAAPI_SURFACE_PROXY_CROP_RECT(proxy) \ #define GST_VAAPI_SURFACE_PROXY_CROP_RECT(proxy) \
(GST_VAAPI_SURFACE_PROXY(proxy)->has_crop_rect ? \ (GST_VAAPI_SURFACE_PROXY (proxy)->has_crop_rect ? \
&GST_VAAPI_SURFACE_PROXY(proxy)->crop_rect : NULL) &GST_VAAPI_SURFACE_PROXY (proxy)->crop_rect : NULL)
#endif /* GST_VAAPI_SURFACE_PROXY_PRIV_H */ #endif /* GST_VAAPI_SURFACE_PROXY_PRIV_H */