mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-05 18:22:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

plugins: re-indent all GstVaapiVideo* related source code.

Browse source
This commit is contained in:
Gwenole Beauchesne 2014-08-21 10:45:31 +02:00
parent 97d7f21575
commit 038d56bdca
16 changed files with 1561 additions and 1572 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
gst/vaapi/gstvaapivideobuffer.c
View file

@ -49,17 +49,20 @@ gst_surface_buffer_new(void)
((GstVaapiSurfaceMeta *) (obj))
typedef struct _GstVaapiSurfaceMeta GstVaapiSurfaceMeta;
struct _GstVaapiSurfaceMeta {
struct _GstVaapiSurfaceMeta
{
GstSurfaceMeta base;
GstBuffer *buffer;
};
#define GST_VAAPI_SURFACE_META_INFO gst_vaapi_surface_meta_get_info()
#define GST_VAAPI_SURFACE_META_INFO \
gst_vaapi_surface_meta_get_info ()
static const GstMetaInfo *
gst_vaapi_surface_meta_get_info (void);
typedef GstSurfaceConverter *(*GstSurfaceConverterCreateFunc)(
GstSurfaceMeta *meta, const gchar *type, GValue *dest);
typedef GstSurfaceConverter *(*GstSurfaceConverterCreateFunc) (GstSurfaceMeta *
meta, const gchar * type, GValue * dest);
#if USE_X11
static GstSurfaceConverter *
@ -131,8 +134,9 @@ gst_vaapi_surface_meta_transform(GstBuffer *dst_buffer, GstMeta *meta,
gst_buffer_get_vaapi_video_meta (src_buffer);
if (GST_META_TRANSFORM_IS_COPY (type)) {
GstVaapiSurfaceMeta * const dst_smeta = GST_VAAPI_SURFACE_META_CAST(
gst_buffer_add_meta(dst_buffer, GST_VAAPI_SURFACE_META_INFO, NULL));
GstVaapiSurfaceMeta *const dst_smeta =
GST_VAAPI_SURFACE_META_CAST (gst_buffer_add_meta (dst_buffer,
GST_VAAPI_SURFACE_META_INFO, NULL));
/* Note: avoid meta lookups in gst_vaapi_surface_create_converter()
by directly calling the GstVaapiVideoMeta::surface_converter hook */
@ -149,8 +153,8 @@ gst_vaapi_surface_meta_get_info(void)
static gsize g_meta_info;
if (g_once_init_enter (&g_meta_info)) {
gsize meta_info = GPOINTER_TO_SIZE(gst_meta_register(
GST_SURFACE_META_API_TYPE,
gsize meta_info =
GPOINTER_TO_SIZE (gst_meta_register (GST_SURFACE_META_API_TYPE,
"GstVaapiSurfaceMeta", sizeof (GstVaapiSurfaceMeta),
(GstMetaInitFunction) gst_vaapi_surface_meta_init,
(GstMetaFreeFunction) gst_vaapi_surface_meta_free,
@ -174,26 +178,18 @@ gst_surface_buffer_new(void)
#define GST_VAAPI_TYPE_VIDEO_BUFFER \
(gst_vaapi_video_buffer_get_type ())
#define GST_VAAPI_VIDEO_BUFFER(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), \
GST_VAAPI_TYPE_VIDEO_BUFFER, \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_VAAPI_TYPE_VIDEO_BUFFER, \
GstVaapiVideoBuffer))
#define GST_VAAPI_VIDEO_BUFFER_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), \
GST_VAAPI_TYPE_VIDEO_BUFFER, \
(G_TYPE_CHECK_CLASS_CAST ((klass), GST_VAAPI_TYPE_VIDEO_BUFFER, \
GstVaapiVideoBufferClass))
#define GST_VAAPI_IS_VIDEO_BUFFER(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_VAAPI_TYPE_VIDEO_BUFFER))
#define GST_VAAPI_IS_VIDEO_BUFFER_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_VAAPI_TYPE_VIDEO_BUFFER))
#define GST_VAAPI_VIDEO_BUFFER_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS((obj), \
GST_VAAPI_TYPE_VIDEO_BUFFER, \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GST_VAAPI_TYPE_VIDEO_BUFFER, \
GstVaapiVideoBufferClass))
typedef struct _GstVaapiVideoBufferClass GstVaapiVideoBufferClass;
@ -203,7 +199,8 @@ typedef struct _GstVaapiVideoBufferClass GstVaapiVideoBufferClass;
*
* A #GstBuffer holding video objects (#GstVaapiSurface and #GstVaapiImage).
*/
struct _GstVaapiVideoBuffer {
struct _GstVaapiVideoBuffer
{
/*< private >*/
GstSurfaceBuffer parent_instance;
};
@ -213,7 +210,8 @@ struct _GstVaapiVideoBuffer {
*
* A #GstBuffer holding video objects
*/
struct _GstVaapiVideoBufferClass {
struct _GstVaapiVideoBufferClass
{
/*< private >*/
GstSurfaceBufferClass parent_class;
};
@ -222,11 +220,11 @@ GType
gst_vaapi_video_buffer_get_type (void) G_GNUC_CONST;
G_DEFINE_TYPE (GstVaapiVideoBuffer,
gst_vaapi_video_buffer,
GST_TYPE_SURFACE_BUFFER)
gst_vaapi_video_buffer, GST_TYPE_SURFACE_BUFFER);
typedef GstSurfaceConverter *(*GstSurfaceConverterCreateFunc)(
GstSurfaceBuffer *surface, const gchar *type, GValue *dest);
typedef GstSurfaceConverter *
(*GstSurfaceConverterCreateFunc) (GstSurfaceBuffer * surface,
const gchar * type, GValue * dest);
static GstSurfaceConverter *
gst_vaapi_video_buffer_create_converter (GstSurfaceBuffer * surface,
@ -247,8 +245,7 @@ gst_vaapi_video_buffer_create_converter(GstSurfaceBuffer *surface,
static void
gst_vaapi_video_buffer_class_init (GstVaapiVideoBufferClass * klass)
{
GstSurfaceBufferClass * const surface_class =
GST_SURFACE_BUFFER_CLASS(klass);
GstSurfaceBufferClass *const surface_class = GST_SURFACE_BUFFER_CLASS (klass);
surface_class->create_converter = gst_vaapi_video_buffer_create_converter;
}

26
gst/vaapi/gstvaapivideobufferpool.c
View file

@ -32,16 +32,17 @@ GST_DEBUG_CATEGORY_STATIC(gst_debug_vaapivideopool);
#define GST_CAT_DEFAULT gst_debug_vaapivideopool
G_DEFINE_TYPE (GstVaapiVideoBufferPool,
gst_vaapi_video_buffer_pool,
GST_TYPE_BUFFER_POOL)
gst_vaapi_video_buffer_pool, GST_TYPE_BUFFER_POOL);
enum {
enum
{
PROP_0,
PROP_DISPLAY,
};
struct _GstVaapiVideoBufferPoolPrivate {
struct _GstVaapiVideoBufferPoolPrivate
{
GstVideoInfo video_info[2];
guint video_info_index;
GstAllocator *allocator;
@ -52,8 +53,7 @@ struct _GstVaapiVideoBufferPoolPrivate {
};
#define GST_VAAPI_VIDEO_BUFFER_POOL_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE((obj), \
GST_VAAPI_TYPE_VIDEO_BUFFER_POOL, \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_VAAPI_TYPE_VIDEO_BUFFER_POOL, \
GstVaapiVideoBufferPoolPrivate))
static void
@ -125,6 +125,7 @@ gst_vaapi_video_buffer_pool_get_options(GstBufferPool *pool)
GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT,
NULL,
};
return g_options;
}
@ -178,8 +179,9 @@ gst_vaapi_video_buffer_pool_set_config(GstBufferPool *pool,
priv->has_texture_upload_meta = gst_buffer_pool_config_has_option (config,
GST_BUFFER_POOL_OPTION_VIDEO_GL_TEXTURE_UPLOAD_META);
return GST_BUFFER_POOL_CLASS(gst_vaapi_video_buffer_pool_parent_class)->
set_config(pool, config);
return
GST_BUFFER_POOL_CLASS
(gst_vaapi_video_buffer_pool_parent_class)->set_config (pool, config);
/* ERRORS */
error_invalid_config:
@ -244,7 +246,6 @@ gst_vaapi_video_buffer_pool_alloc_buffer(GstBufferPool *pool,
vmeta->map = gst_video_meta_map_vaapi_memory;
vmeta->unmap = gst_video_meta_unmap_vaapi_memory;
}
#if GST_CHECK_VERSION(1,1,0) && USE_GLX
if (priv->has_texture_upload_meta)
gst_buffer_add_texture_upload_meta (buffer);
@ -280,15 +281,16 @@ error_create_memory:
}
static void
gst_vaapi_video_buffer_pool_reset_buffer(GstBufferPool *pool, GstBuffer *buffer)
gst_vaapi_video_buffer_pool_reset_buffer (GstBufferPool * pool,
GstBuffer * buffer)
{
GstMemory *const mem = gst_buffer_peek_memory (buffer, 0);
/* Release the underlying surface proxy */
gst_vaapi_video_memory_reset_surface (GST_VAAPI_VIDEO_MEMORY_CAST (mem));
GST_BUFFER_POOL_CLASS(gst_vaapi_video_buffer_pool_parent_class)->
reset_buffer(pool, buffer);
GST_BUFFER_POOL_CLASS (gst_vaapi_video_buffer_pool_parent_class)->reset_buffer
(pool, buffer);
}
static void

19
gst/vaapi/gstvaapivideobufferpool.h
View file

@ -30,20 +30,14 @@ G_BEGIN_DECLS
#define GST_VAAPI_TYPE_VIDEO_BUFFER_POOL \
(gst_vaapi_video_buffer_pool_get_type ())
#define GST_VAAPI_VIDEO_BUFFER_POOL(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), \
GST_VAAPI_TYPE_VIDEO_BUFFER_POOL, \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_VAAPI_TYPE_VIDEO_BUFFER_POOL, \
GstVaapiVideoBufferPool))
#define GST_VAAPI_VIDEO_BUFFER_POOL_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), \
GST_VAAPI_TYPE_VIDEO_BUFFER_POOL, \
(G_TYPE_CHECK_CLASS_CAST ((klass), GST_VAAPI_TYPE_VIDEO_BUFFER_POOL, \
GstVaapiVideoBufferPoolClass))
#define GST_VAAPI_IS_VIDEO_BUFFER_POOL(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_VAAPI_TYPE_VIDEO_BUFFER_POOL))
#define GST_VAAPI_IS_VIDEO_BUFFER_POOL_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_VAAPI_TYPE_VIDEO_BUFFER_POOL))
@ -57,7 +51,8 @@ typedef struct _GstVaapiVideoBufferPoolPrivate GstVaapiVideoBufferPoolPrivate;
* An option that can be activated on bufferpool to request vaapi
* video metadata on buffers from the pool.
*/
#define GST_BUFFER_POOL_OPTION_VAAPI_VIDEO_META "GstBufferPoolOptionVaapiVideoMeta"
#define GST_BUFFER_POOL_OPTION_VAAPI_VIDEO_META \
"GstBufferPoolOptionVaapiVideoMeta"
/**
*
@ -79,7 +74,8 @@ typedef struct _GstVaapiVideoBufferPoolPrivate GstVaapiVideoBufferPoolPrivate;
*
* A VA video buffer pool object.
*/
struct _GstVaapiVideoBufferPool {
struct _GstVaapiVideoBufferPool
{
GstBufferPool parent_instance;
/*< private >*/
@ -91,7 +87,8 @@ struct _GstVaapiVideoBufferPool {
*
* A VA video buffer pool class.
*/
struct _GstVaapiVideoBufferPoolClass {
struct _GstVaapiVideoBufferPoolClass
{
GstBufferPoolClass parent_class;
};

10
gst/vaapi/gstvaapivideocontext.c
View file

@ -34,15 +34,15 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_CONTEXT);
gst_vaapi_display_get_type ()
GType
gst_vaapi_display_get_type (void)
G_GNUC_CONST;
gst_vaapi_display_get_type (void) G_GNUC_CONST;
G_DEFINE_BOXED_TYPE (GstVaapiDisplay, gst_vaapi_display,
(GBoxedCopyFunc) gst_vaapi_display_ref,
(GBoxedFreeFunc) gst_vaapi_display_unref)
(GBoxedFreeFunc) gst_vaapi_display_unref);
GstContext *gst_vaapi_video_context_new_with_display (GstVaapiDisplay *
display, gboolean persistent)
GstContext *
gst_vaapi_video_context_new_with_display (GstVaapiDisplay * display,
gboolean persistent)
{
GstContext *context;
GstStructure *structure;

20
gst/vaapi/gstvaapivideoconverter_glx.c
View file

@ -40,19 +40,18 @@ typedef gboolean (*GstSurfaceUploadFunction)(GstSurfaceConverter *,
static void
gst_vaapi_video_converter_glx_iface_init (GstSurfaceConverterInterface * iface);
G_DEFINE_TYPE_WITH_CODE(
GstVaapiVideoConverterGLX,
G_DEFINE_TYPE_WITH_CODE (GstVaapiVideoConverterGLX,
gst_vaapi_video_converter_glx,
G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (GST_TYPE_SURFACE_CONVERTER,
gst_vaapi_video_converter_glx_iface_init))
gst_vaapi_video_converter_glx_iface_init));
#define GST_VAAPI_VIDEO_CONVERTER_GLX_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE((obj), \
GST_VAAPI_TYPE_VIDEO_CONVERTER_GLX, \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_VAAPI_TYPE_VIDEO_CONVERTER_GLX, \
GstVaapiVideoConverterGLXPrivate))
struct _GstVaapiVideoConverterGLXPrivate {
struct _GstVaapiVideoConverterGLXPrivate
{
GstVaapiTexture *texture;
};
@ -72,7 +71,8 @@ gst_vaapi_video_converter_glx_dispose(GObject *object)
}
static void
gst_vaapi_video_converter_glx_class_init(GstVaapiVideoConverterGLXClass *klass)
gst_vaapi_video_converter_glx_class_init (GstVaapiVideoConverterGLXClass *
klass)
{
GObjectClass *const object_class = G_OBJECT_CLASS (klass);
@ -119,9 +119,9 @@ gst_vaapi_video_converter_glx_new(GstBuffer *buffer, const gchar *type,
return gst_vaapi_video_converter_x11_new (buffer, type, dest);
/* FIXME Should we assume target and format ? */
texture = gst_vaapi_texture_new_with_texture(
gst_vaapi_video_meta_get_display(meta),
g_value_get_uint(dest), GL_TEXTURE_2D, GL_BGRA);
texture =
gst_vaapi_texture_new_with_texture (gst_vaapi_video_meta_get_display
(meta), g_value_get_uint (dest), GL_TEXTURE_2D, GL_BGRA);
if (!texture)
return NULL;

23
gst/vaapi/gstvaapivideoconverter_glx.h
View file

@ -32,30 +32,23 @@ G_BEGIN_DECLS
#define GST_VAAPI_TYPE_VIDEO_CONVERTER_GLX \
(gst_vaapi_video_converter_glx_get_type ())
#define GST_VAAPI_VIDEO_CONVERTER_GLX(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), \
GST_VAAPI_TYPE_VIDEO_CONVERTER_GLX, \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_VAAPI_TYPE_VIDEO_CONVERTER_GLX, \
GstVaapiVideoConverterGLX))
#define GST_VAAPI_VIDEO_CONVERTER_GLX_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), \
GST_VAAPI_TYPE_VIDEO_CONVERTER_GLX, \
(G_TYPE_CHECK_CLASS_CAST ((klass), GST_VAAPI_TYPE_VIDEO_CONVERTER_GLX, \
GstVaapiVideoConverterGLXClass))
#define GST_VAAPI_IS_VIDEO_CONVERTER_GLX(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_VAAPI_TYPE_VIDEO_CONVERTER_GLX))
#define GST_VAAPI_IS_VIDEO_CONVERTER_GLX_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_VAAPI_TYPE_VIDEO_CONVERTER_GLX))
#define GST_VAAPI_VIDEO_CONVERTER_GLX_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS((obj), \
GST_VAAPI_TYPE_VIDEO_CONVERTER_GLX, \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GST_VAAPI_TYPE_VIDEO_CONVERTER_GLX, \
GstVaapiVideoConverterGLXClass))
typedef struct _GstVaapiVideoConverterGLX GstVaapiVideoConverterGLX;
typedef struct _GstVaapiVideoConverterGLXPrivate GstVaapiVideoConverterGLXPrivate;
typedef struct _GstVaapiVideoConverterGLXPrivate
GstVaapiVideoConverterGLXPrivate;
typedef struct _GstVaapiVideoConverterGLXClass GstVaapiVideoConverterGLXClass;
/**
@ -63,7 +56,8 @@ typedef struct _GstVaapiVideoConverterGLXClass GstVaapiVideoConverterGLXClass;
*
* Converter to transform VA buffers into GL textures.
*/
struct _GstVaapiVideoConverterGLX {
struct _GstVaapiVideoConverterGLX
{
/*< private >*/
GObject parent_instance;
@ -75,7 +69,8 @@ struct _GstVaapiVideoConverterGLX {
*
* Converter class to transform VA buffers into GL textures.
*/
struct _GstVaapiVideoConverterGLXClass {
struct _GstVaapiVideoConverterGLXClass
{
/*< private >*/
GObjectClass parent_class;
};

14
gst/vaapi/gstvaapivideoconverter_x11.c
View file

@ -37,19 +37,18 @@ typedef gboolean (*GstSurfaceUploadFunction)(GstSurfaceConverter *,
static void
gst_vaapi_video_converter_x11_iface_init (GstSurfaceConverterInterface * iface);
G_DEFINE_TYPE_WITH_CODE(
GstVaapiVideoConverterX11,
G_DEFINE_TYPE_WITH_CODE (GstVaapiVideoConverterX11,
gst_vaapi_video_converter_x11,
G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (GST_TYPE_SURFACE_CONVERTER,
gst_vaapi_video_converter_x11_iface_init))
gst_vaapi_video_converter_x11_iface_init));
#define GST_VAAPI_VIDEO_CONVERTER_X11_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE((obj), \
GST_VAAPI_TYPE_VIDEO_CONVERTER_X11, \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_VAAPI_TYPE_VIDEO_CONVERTER_X11, \
GstVaapiVideoConverterX11Private))
struct _GstVaapiVideoConverterX11Private {
struct _GstVaapiVideoConverterX11Private
{
GstVaapiPixmap *pixmap;
XID pixmap_id;
};
@ -70,7 +69,8 @@ gst_vaapi_video_converter_x11_dispose(GObject *object)
}
static void
gst_vaapi_video_converter_x11_class_init(GstVaapiVideoConverterX11Class *klass)
gst_vaapi_video_converter_x11_class_init (GstVaapiVideoConverterX11Class *
klass)
{
GObjectClass *const object_class = G_OBJECT_CLASS (klass);

23
gst/vaapi/gstvaapivideoconverter_x11.h
View file

@ -30,30 +30,23 @@ G_BEGIN_DECLS
#define GST_VAAPI_TYPE_VIDEO_CONVERTER_X11 \
(gst_vaapi_video_converter_x11_get_type ())
#define GST_VAAPI_VIDEO_CONVERTER_X11(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), \
GST_VAAPI_TYPE_VIDEO_CONVERTER_X11, \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_VAAPI_TYPE_VIDEO_CONVERTER_X11, \
GstVaapiVideoConverterX11))
#define GST_VAAPI_VIDEO_CONVERTER_X11_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), \
GST_VAAPI_TYPE_VIDEO_CONVERTER_X11, \
(G_TYPE_CHECK_CLASS_CAST ((klass), GST_VAAPI_TYPE_VIDEO_CONVERTER_X11, \
GstVaapiVideoConverterX11Class))
#define GST_VAAPI_IS_VIDEO_CONVERTER_X11(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_VAAPI_TYPE_VIDEO_CONVERTER_X11))
#define GST_VAAPI_IS_VIDEO_CONVERTER_X11_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_VAAPI_TYPE_VIDEO_CONVERTER_X11))
#define GST_VAAPI_VIDEO_CONVERTER_X11_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS((obj), \
GST_VAAPI_TYPE_VIDEO_CONVERTER_X11, \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GST_VAAPI_TYPE_VIDEO_CONVERTER_X11, \
GstVaapiVideoConverterX11Class))
typedef struct _GstVaapiVideoConverterX11 GstVaapiVideoConverterX11;
typedef struct _GstVaapiVideoConverterX11Private GstVaapiVideoConverterX11Private;
typedef struct _GstVaapiVideoConverterX11Private
GstVaapiVideoConverterX11Private;
typedef struct _GstVaapiVideoConverterX11Class GstVaapiVideoConverterX11Class;
/**
@ -61,7 +54,8 @@ typedef struct _GstVaapiVideoConverterX11Class GstVaapiVideoConverterX11Class;
*
* Converter to transform VA buffers into GL textures.
*/
struct _GstVaapiVideoConverterX11 {
struct _GstVaapiVideoConverterX11
{
/*< private >*/
GObject parent_instance;
@ -73,7 +67,8 @@ struct _GstVaapiVideoConverterX11 {
*
* Converter class to transform VA buffers into GL textures.
*/
struct _GstVaapiVideoConverterX11Class {
struct _GstVaapiVideoConverterX11Class
{
/*< private >*/
GObjectClass parent_class;
};

34
gst/vaapi/gstvaapivideomemory.c
View file

@ -72,8 +72,7 @@ ensure_image(GstVaapiVideoMemory *mem)
if (!mem->image) {
GST_WARNING ("failed to derive image, fallbacking to copy");
mem->use_direct_rendering = FALSE;
}
else if (gst_vaapi_surface_get_format(mem->surface) !=
} else if (gst_vaapi_surface_get_format (mem->surface) !=
GST_VIDEO_INFO_FORMAT (mem->image_info)) {
gst_vaapi_object_replace (&mem->image, NULL);
mem->use_direct_rendering = FALSE;
@ -109,8 +108,8 @@ new_surface(GstVaapiDisplay *display, const GstVideoInfo *vip)
}
/* Try to pick something compatible, i.e. with same chroma type */
chroma_type = gst_vaapi_video_format_get_chroma_type(
GST_VIDEO_INFO_FORMAT(vip));
chroma_type =
gst_vaapi_video_format_get_chroma_type (GST_VIDEO_INFO_FORMAT (vip));
if (!chroma_type)
return NULL;
return gst_vaapi_surface_new (display, chroma_type,
@ -123,8 +122,9 @@ new_surface_proxy(GstVaapiVideoMemory *mem)
GstVaapiVideoAllocator *const allocator =
GST_VAAPI_VIDEO_ALLOCATOR_CAST (GST_MEMORY_CAST (mem)->allocator);
return gst_vaapi_surface_proxy_new_from_pool(
GST_VAAPI_SURFACE_POOL(allocator->surface_pool));
return
gst_vaapi_surface_proxy_new_from_pool (GST_VAAPI_SURFACE_POOL
(allocator->surface_pool));
}
static gboolean
@ -157,8 +157,7 @@ gst_video_meta_map_vaapi_memory(GstVideoMeta *meta, guint plane,
allocator), FALSE);
g_return_val_if_fail (mem->meta, FALSE);
if (mem->map_type &&
mem->map_type != GST_VAAPI_VIDEO_MEMORY_MAP_TYPE_PLANAR)
if (mem->map_type && mem->map_type != GST_VAAPI_VIDEO_MEMORY_MAP_TYPE_PLANAR)
goto error_incompatible_map;
/* Map for writing */
@ -324,7 +323,8 @@ gst_vaapi_video_memory_reset_surface(GstVaapiVideoMemory *mem)
}
static gpointer
gst_vaapi_video_memory_map(GstVaapiVideoMemory *mem, gsize maxsize, guint flags)
gst_vaapi_video_memory_map (GstVaapiVideoMemory * mem, gsize maxsize,
guint flags)
{
gpointer data;
@ -472,16 +472,14 @@ gst_vaapi_video_memory_is_span(GstVaapiVideoMemory *mem1,
/* ------------------------------------------------------------------------ */
#define GST_VAAPI_VIDEO_ALLOCATOR_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), \
GST_VAAPI_TYPE_VIDEO_ALLOCATOR, \
(G_TYPE_CHECK_CLASS_CAST ((klass), GST_VAAPI_TYPE_VIDEO_ALLOCATOR, \
GstVaapiVideoAllocatorClass))
#define GST_VAAPI_IS_VIDEO_ALLOCATOR_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_VAAPI_TYPE_VIDEO_ALLOCATOR))
G_DEFINE_TYPE (GstVaapiVideoAllocator,
gst_vaapi_video_allocator,
GST_TYPE_ALLOCATOR)
gst_vaapi_video_allocator, GST_TYPE_ALLOCATOR);
static GstMemory *
gst_vaapi_video_allocator_alloc (GstAllocator * allocator, gsize size,
@ -574,15 +572,15 @@ gst_video_info_update_from_image(GstVideoInfo *vip, GstVaapiImage *image)
for (i = 0; i < num_planes; i++) {
const guchar *const plane = gst_vaapi_image_get_plane (image, i);
GST_VIDEO_INFO_PLANE_OFFSET (vip, i) = plane - data;
GST_VIDEO_INFO_PLANE_STRIDE(vip, i) =
gst_vaapi_image_get_pitch(image, i);
GST_VIDEO_INFO_PLANE_STRIDE (vip, i) = gst_vaapi_image_get_pitch (image, i);
}
GST_VIDEO_INFO_SIZE (vip) = data_size;
return TRUE;
}
GstAllocator *
gst_vaapi_video_allocator_new(GstVaapiDisplay *display, const GstVideoInfo *vip)
gst_vaapi_video_allocator_new (GstVaapiDisplay * display,
const GstVideoInfo * vip)
{
GstVaapiVideoAllocator *allocator;
GstVaapiSurface *surface;
@ -610,8 +608,8 @@ gst_vaapi_video_allocator_new(GstVaapiDisplay *display, const GstVideoInfo *vip)
break;
if (!gst_vaapi_image_map (image))
break;
allocator->has_direct_rendering = gst_video_info_update_from_image(
&allocator->surface_info, image);
allocator->has_direct_rendering =
gst_video_info_update_from_image (&allocator->surface_info, image);
if (GST_VAAPI_IMAGE_FORMAT (image) != GST_VIDEO_INFO_FORMAT (vip))
allocator->has_direct_rendering = FALSE;
if (USE_NATIVE_FORMATS)

17
gst/vaapi/gstvaapivideomemory.h
View file

@ -59,7 +59,8 @@ typedef struct _GstVaapiVideoAllocatorClass GstVaapiVideoAllocatorClass;
*
* The set of all #GstVaapiVideoMemory map types.
*/
typedef enum {
typedef enum
{
GST_VAAPI_VIDEO_MEMORY_MAP_TYPE_SURFACE = 1,
GST_VAAPI_VIDEO_MEMORY_MAP_TYPE_PLANAR,
GST_VAAPI_VIDEO_MEMORY_MAP_TYPE_LINEAR
@ -71,7 +72,8 @@ typedef enum {
* A VA video memory object holder, including VA surfaces, images and
* proxies.
*/
struct _GstVaapiVideoMemory {
struct _GstVaapiVideoMemory
{
GstMemory parent_instance;
/*< private >*/
@ -113,12 +115,9 @@ gst_vaapi_video_memory_reset_surface(GstVaapiVideoMemory *mem);
#define GST_VAAPI_TYPE_VIDEO_ALLOCATOR \
(gst_vaapi_video_allocator_get_type ())
#define GST_VAAPI_VIDEO_ALLOCATOR(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), \
GST_VAAPI_TYPE_VIDEO_ALLOCATOR, \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_VAAPI_TYPE_VIDEO_ALLOCATOR, \
GstVaapiVideoAllocator))
#define GST_VAAPI_IS_VIDEO_ALLOCATOR(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_VAAPI_TYPE_VIDEO_ALLOCATOR))
@ -129,7 +128,8 @@ gst_vaapi_video_memory_reset_surface(GstVaapiVideoMemory *mem);
*
* A VA video memory allocator object.
*/
struct _GstVaapiVideoAllocator {
struct _GstVaapiVideoAllocator
{
GstAllocator parent_instance;
/*< private >*/
@ -146,7 +146,8 @@ struct _GstVaapiVideoAllocator {
*
* A VA video memory allocator class.
*/
struct _GstVaapiVideoAllocatorClass {
struct _GstVaapiVideoAllocatorClass
{
GstAllocatorClass parent_class;
};

20
gst/vaapi/gstvaapivideometa.c
View file

@ -34,11 +34,11 @@
#define GST_VAAPI_VIDEO_META(obj) \
((GstVaapiVideoMeta *) (obj))
#define GST_VAAPI_IS_VIDEO_META(obj) \
(GST_VAAPI_VIDEO_META (obj) != NULL)
struct _GstVaapiVideoMeta {
struct _GstVaapiVideoMeta
{
gint ref_count;
GstVaapiDisplay *display;
GstVaapiVideoPool *image_pool;
@ -226,8 +226,7 @@ gst_vaapi_video_meta_copy(GstVaapiVideoMeta *meta)
copy->display = gst_vaapi_display_ref (meta->display);
copy->image_pool = NULL;
copy->image = meta->image ? gst_vaapi_object_ref (meta->image) : NULL;
copy->proxy = meta->proxy ?
gst_vaapi_surface_proxy_copy(meta->proxy) : NULL;
copy->proxy = meta->proxy ? gst_vaapi_surface_proxy_copy (meta->proxy) : NULL;
copy->converter = meta->converter;
copy->render_flags = meta->render_flags;
@ -606,7 +605,8 @@ gst_vaapi_video_meta_get_surface_converter(GstVaapiVideoMeta *meta)
* Sets the @meta surface converter function to @func.
*/
void
gst_vaapi_video_meta_set_surface_converter(GstVaapiVideoMeta *meta, GFunc func)
gst_vaapi_video_meta_set_surface_converter (GstVaapiVideoMeta * meta,
GFunc func)
{
g_return_if_fail (GST_VAAPI_IS_VIDEO_META (meta));
@ -688,7 +688,8 @@ gst_vaapi_video_meta_set_render_rect(GstVaapiVideoMeta *meta,
((GstVaapiVideoMetaHolder *) (meta))
typedef struct _GstVaapiVideoMetaHolder GstVaapiVideoMetaHolder;
struct _GstVaapiVideoMetaHolder {
struct _GstVaapiVideoMetaHolder
{
GstMeta base;
GstVaapiVideoMeta *meta;
};
@ -713,8 +714,7 @@ static gboolean
gst_vaapi_video_meta_holder_transform (GstBuffer * dst_buffer, GstMeta * meta,
GstBuffer * src_buffer, GQuark type, gpointer data)
{
GstVaapiVideoMetaHolder * const src_meta =
GST_VAAPI_VIDEO_META_HOLDER(meta);
GstVaapiVideoMetaHolder *const src_meta = GST_VAAPI_VIDEO_META_HOLDER (meta);
if (GST_META_TRANSFORM_IS_COPY (type)) {
GstVaapiVideoMeta *const dst_meta =
@ -746,8 +746,8 @@ gst_vaapi_video_meta_info_get(void)
static gsize g_meta_info;
if (g_once_init_enter (&g_meta_info)) {
gsize meta_info = GPOINTER_TO_SIZE(gst_meta_register(
GST_VAAPI_VIDEO_META_API_TYPE,
gsize meta_info =
GPOINTER_TO_SIZE (gst_meta_register (GST_VAAPI_VIDEO_META_API_TYPE,
"GstVaapiVideoMeta", sizeof (GstVaapiVideoMetaHolder),
(GstMetaInitFunction) gst_vaapi_video_meta_holder_init,
(GstMetaFreeFunction) gst_vaapi_video_meta_holder_free,

6
gst/vaapi/gstvaapivideometa.h
View file

@ -87,7 +87,8 @@ gst_vaapi_video_meta_get_image(GstVaapiVideoMeta *meta);
G_GNUC_INTERNAL
void
gst_vaapi_video_meta_set_image(GstVaapiVideoMeta *meta, GstVaapiImage *image);
gst_vaapi_video_meta_set_image (GstVaapiVideoMeta * meta,
GstVaapiImage * image);
G_GNUC_INTERNAL
gboolean
@ -113,7 +114,8 @@ gst_vaapi_video_meta_get_surface_converter(GstVaapiVideoMeta *meta);
G_GNUC_INTERNAL
void
gst_vaapi_video_meta_set_surface_converter(GstVaapiVideoMeta *meta, GFunc func);
gst_vaapi_video_meta_set_surface_converter (GstVaapiVideoMeta * meta,
GFunc func);
G_GNUC_INTERNAL
guint

6
gst/vaapi/gstvaapivideometa_texture.c
View file

@ -30,7 +30,8 @@
#include "gstvaapipluginutil.h"
#if GST_CHECK_VERSION(1,1,0) && USE_GLX
struct _GstVaapiVideoMetaTexture {
struct _GstVaapiVideoMetaTexture
{
GstVaapiTexture *texture;
};
@ -71,7 +72,8 @@ meta_texture_copy(GstVaapiVideoMetaTexture *meta)
}
static gboolean
gst_vaapi_texture_upload(GstVideoGLTextureUploadMeta *meta, guint texture_id[4])
gst_vaapi_texture_upload (GstVideoGLTextureUploadMeta * meta,
guint texture_id[4])
{
GstVaapiVideoMeta *const vmeta =
gst_buffer_get_vaapi_video_meta (meta->buffer);