[Pkg-gstreamer-commits] [gstreamer-vaapi] 83/176: codec: re-indent base codec objects.
Vincent Cheng
vcheng at moszumanska.debian.org
Tue Jun 3 08:09:30 UTC 2014
This is an automated email from the git hooks/post-receive script.
vcheng pushed a commit to branch upstream
in repository gstreamer-vaapi.
commit c010ce234014a830d83ed65d0bd739319df460ea
Author: Gwenole Beauchesne <gwenole.beauchesne at intel.com>
Date: Thu Jan 9 09:10:21 2014 +0100
codec: re-indent base codec objects.
---
gst-libs/gst/vaapi/gstvaapicodec_objects.c | 222 ++++++++++++-----------------
gst-libs/gst/vaapi/gstvaapicodec_objects.h | 168 +++++++++++-----------
2 files changed, 176 insertions(+), 214 deletions(-)
diff --git a/gst-libs/gst/vaapi/gstvaapicodec_objects.c b/gst-libs/gst/vaapi/gstvaapicodec_objects.c
index 1d287df..f7204af 100644
--- a/gst-libs/gst/vaapi/gstvaapicodec_objects.c
+++ b/gst-libs/gst/vaapi/gstvaapicodec_objects.c
@@ -41,60 +41,60 @@
gst_vaapi_codec_object_get_class(object)
const GstVaapiCodecObjectClass *
-gst_vaapi_codec_object_get_class(GstVaapiCodecObject *object)
+gst_vaapi_codec_object_get_class (GstVaapiCodecObject * object)
{
- return (const GstVaapiCodecObjectClass *)
- GST_VAAPI_MINI_OBJECT_GET_CLASS(object);
+ return (const GstVaapiCodecObjectClass *)
+ GST_VAAPI_MINI_OBJECT_GET_CLASS (object);
}
static gboolean
-gst_vaapi_codec_object_create(GstVaapiCodecObject *object,
- const GstVaapiCodecObjectConstructorArgs *args)
+gst_vaapi_codec_object_create (GstVaapiCodecObject * object,
+ const GstVaapiCodecObjectConstructorArgs * args)
{
- const GstVaapiCodecObjectClass *klass;
+ const GstVaapiCodecObjectClass *klass;
- g_return_val_if_fail(args->param_size > 0, FALSE);
+ g_return_val_if_fail (args->param_size > 0, FALSE);
- if (GST_VAAPI_MINI_OBJECT_FLAG_IS_SET(object,
- GST_VAAPI_CODEC_OBJECT_FLAG_CONSTRUCTED))
- return TRUE;
+ if (GST_VAAPI_MINI_OBJECT_FLAG_IS_SET (object,
+ GST_VAAPI_CODEC_OBJECT_FLAG_CONSTRUCTED))
+ return TRUE;
- klass = GST_VAAPI_CODEC_OBJECT_GET_CLASS(object);
- if (!klass->create || !klass->create(object, args))
- return FALSE;
+ klass = GST_VAAPI_CODEC_OBJECT_GET_CLASS (object);
+ if (!klass->create || !klass->create (object, args))
+ return FALSE;
- GST_VAAPI_MINI_OBJECT_FLAG_SET(object,
- GST_VAAPI_CODEC_OBJECT_FLAG_CONSTRUCTED);
- return TRUE;
+ GST_VAAPI_MINI_OBJECT_FLAG_SET (object,
+ GST_VAAPI_CODEC_OBJECT_FLAG_CONSTRUCTED);
+ return TRUE;
}
GstVaapiCodecObject *
-gst_vaapi_codec_object_new(const GstVaapiCodecObjectClass *object_class,
- GstVaapiCodecBase *codec, gconstpointer param, guint param_size,
+gst_vaapi_codec_object_new (const GstVaapiCodecObjectClass * object_class,
+ GstVaapiCodecBase * codec, gconstpointer param, guint param_size,
gconstpointer data, guint data_size, guint flags)
{
- GstVaapiMiniObject *obj;
- GstVaapiCodecObject *va_obj;
- GstVaapiCodecObjectConstructorArgs args;
+ GstVaapiMiniObject *obj;
+ GstVaapiCodecObject *va_obj;
+ GstVaapiCodecObjectConstructorArgs args;
- obj = gst_vaapi_mini_object_new0(&object_class->parent_class);
- if (!obj)
- return NULL;
+ obj = gst_vaapi_mini_object_new0 (&object_class->parent_class);
+ if (!obj)
+ return NULL;
- va_obj = GST_VAAPI_CODEC_OBJECT(obj);
- va_obj->codec = codec;
+ va_obj = GST_VAAPI_CODEC_OBJECT (obj);
+ va_obj->codec = codec;
- args.param = param;
- args.param_size = param_size;
- args.data = data;
- args.data_size = data_size;
- args.flags = flags;
+ args.param = param;
+ args.param_size = param_size;
+ args.data = data;
+ args.data_size = data_size;
+ args.flags = flags;
- if (gst_vaapi_codec_object_create(va_obj, &args))
- return va_obj;
+ if (gst_vaapi_codec_object_create (va_obj, &args))
+ return va_obj;
- gst_vaapi_mini_object_unref(obj);
- return NULL;
+ gst_vaapi_mini_object_unref (obj);
+ return NULL;
}
#define GET_DECODER(obj) GST_VAAPI_DECODER_CAST((obj)->parent_instance.codec)
@@ -105,97 +105,73 @@ gst_vaapi_codec_object_new(const GstVaapiCodecObjectClass *object_class,
/* --- Inverse Quantization Matrices --- */
/* ------------------------------------------------------------------------- */
-GST_VAAPI_CODEC_DEFINE_TYPE(GstVaapiIqMatrix, gst_vaapi_iq_matrix);
+GST_VAAPI_CODEC_DEFINE_TYPE (GstVaapiIqMatrix, gst_vaapi_iq_matrix);
void
-gst_vaapi_iq_matrix_destroy(GstVaapiIqMatrix *iq_matrix)
+gst_vaapi_iq_matrix_destroy (GstVaapiIqMatrix * iq_matrix)
{
- vaapi_destroy_buffer(GET_VA_DISPLAY(iq_matrix), &iq_matrix->param_id);
- iq_matrix->param = NULL;
+ vaapi_destroy_buffer (GET_VA_DISPLAY (iq_matrix), &iq_matrix->param_id);
+ iq_matrix->param = NULL;
}
gboolean
-gst_vaapi_iq_matrix_create(
- GstVaapiIqMatrix *iq_matrix,
- const GstVaapiCodecObjectConstructorArgs *args
-)
+gst_vaapi_iq_matrix_create (GstVaapiIqMatrix * iq_matrix,
+ const GstVaapiCodecObjectConstructorArgs * args)
{
- iq_matrix->param_id = VA_INVALID_ID;
- return vaapi_create_buffer(GET_VA_DISPLAY(iq_matrix),
- GET_VA_CONTEXT(iq_matrix),
- VAIQMatrixBufferType,
- args->param_size,
- args->param,
- &iq_matrix->param_id,
- &iq_matrix->param);
+ iq_matrix->param_id = VA_INVALID_ID;
+ return vaapi_create_buffer (GET_VA_DISPLAY (iq_matrix),
+ GET_VA_CONTEXT (iq_matrix), VAIQMatrixBufferType,
+ args->param_size, args->param, &iq_matrix->param_id, &iq_matrix->param);
}
GstVaapiIqMatrix *
-gst_vaapi_iq_matrix_new(
- GstVaapiDecoder *decoder,
- gconstpointer param,
- guint param_size
-)
+gst_vaapi_iq_matrix_new (GstVaapiDecoder * decoder,
+ gconstpointer param, guint param_size)
{
- GstVaapiCodecObject *object;
-
- object = gst_vaapi_codec_object_new(
- &GstVaapiIqMatrixClass,
- GST_VAAPI_CODEC_BASE(decoder),
- param, param_size,
- NULL, 0,
- 0
- );
- if (!object)
- return NULL;
- return GST_VAAPI_IQ_MATRIX_CAST(object);
+ GstVaapiCodecObject *object;
+
+ object = gst_vaapi_codec_object_new (&GstVaapiIqMatrixClass,
+ GST_VAAPI_CODEC_BASE (decoder), param, param_size, NULL, 0, 0);
+ if (!object)
+ return NULL;
+ return GST_VAAPI_IQ_MATRIX_CAST (object);
}
/* ------------------------------------------------------------------------- */
/* --- VC-1 Bit Planes --- */
/* ------------------------------------------------------------------------- */
-GST_VAAPI_CODEC_DEFINE_TYPE(GstVaapiBitPlane, gst_vaapi_bitplane);
+GST_VAAPI_CODEC_DEFINE_TYPE (GstVaapiBitPlane, gst_vaapi_bitplane);
void
-gst_vaapi_bitplane_destroy(GstVaapiBitPlane *bitplane)
+gst_vaapi_bitplane_destroy (GstVaapiBitPlane * bitplane)
{
- vaapi_destroy_buffer(GET_VA_DISPLAY(bitplane), &bitplane->data_id);
- bitplane->data = NULL;
+ vaapi_destroy_buffer (GET_VA_DISPLAY (bitplane), &bitplane->data_id);
+ bitplane->data = NULL;
}
gboolean
-gst_vaapi_bitplane_create(
- GstVaapiBitPlane *bitplane,
- const GstVaapiCodecObjectConstructorArgs *args
-)
+gst_vaapi_bitplane_create (GstVaapiBitPlane * bitplane,
+ const GstVaapiCodecObjectConstructorArgs * args)
{
- bitplane->data_id = VA_INVALID_ID;
- return vaapi_create_buffer(GET_VA_DISPLAY(bitplane),
- GET_VA_CONTEXT(bitplane),
- VABitPlaneBufferType,
- args->param_size,
- args->param,
- &bitplane->data_id,
- (void **)&bitplane->data);
+ bitplane->data_id = VA_INVALID_ID;
+ return vaapi_create_buffer (GET_VA_DISPLAY (bitplane),
+ GET_VA_CONTEXT (bitplane), VABitPlaneBufferType, args->param_size,
+ args->param, &bitplane->data_id, (void **) &bitplane->data);
}
GstVaapiBitPlane *
-gst_vaapi_bitplane_new(GstVaapiDecoder *decoder, guint8 *data, guint data_size)
+gst_vaapi_bitplane_new (GstVaapiDecoder * decoder, guint8 * data,
+ guint data_size)
{
- GstVaapiCodecObject *object;
-
- object = gst_vaapi_codec_object_new(
- &GstVaapiBitPlaneClass,
- GST_VAAPI_CODEC_BASE(decoder),
- data, data_size,
- NULL, 0,
- 0
- );
- if (!object)
- return NULL;
- return GST_VAAPI_BITPLANE_CAST(object);
+ GstVaapiCodecObject *object;
+
+ object = gst_vaapi_codec_object_new (&GstVaapiBitPlaneClass,
+ GST_VAAPI_CODEC_BASE (decoder), data, data_size, NULL, 0, 0);
+ if (!object)
+ return NULL;
+ return GST_VAAPI_BITPLANE_CAST (object);
}
/* ------------------------------------------------------------------------- */
@@ -203,49 +179,35 @@ gst_vaapi_bitplane_new(GstVaapiDecoder *decoder, guint8 *data, guint data_size)
/* ------------------------------------------------------------------------- */
#if USE_JPEG_DECODER
-GST_VAAPI_CODEC_DEFINE_TYPE(GstVaapiHuffmanTable, gst_vaapi_huffman_table);
+GST_VAAPI_CODEC_DEFINE_TYPE (GstVaapiHuffmanTable, gst_vaapi_huffman_table);
void
-gst_vaapi_huffman_table_destroy(GstVaapiHuffmanTable *huf_table)
+gst_vaapi_huffman_table_destroy (GstVaapiHuffmanTable * huf_table)
{
- vaapi_destroy_buffer(GET_VA_DISPLAY(huf_table), &huf_table->param_id);
- huf_table->param = NULL;
+ vaapi_destroy_buffer (GET_VA_DISPLAY (huf_table), &huf_table->param_id);
+ huf_table->param = NULL;
}
gboolean
-gst_vaapi_huffman_table_create(
- GstVaapiHuffmanTable *huf_table,
- const GstVaapiCodecObjectConstructorArgs *args
-)
+gst_vaapi_huffman_table_create (GstVaapiHuffmanTable * huf_table,
+ const GstVaapiCodecObjectConstructorArgs * args)
{
- huf_table->param_id = VA_INVALID_ID;
- return vaapi_create_buffer(GET_VA_DISPLAY(huf_table),
- GET_VA_CONTEXT(huf_table),
- VAHuffmanTableBufferType,
- args->param_size,
- args->param,
- &huf_table->param_id,
- (void **)&huf_table->param);
+ huf_table->param_id = VA_INVALID_ID;
+ return vaapi_create_buffer (GET_VA_DISPLAY (huf_table),
+ GET_VA_CONTEXT (huf_table), VAHuffmanTableBufferType, args->param_size,
+ args->param, &huf_table->param_id, (void **) &huf_table->param);
}
GstVaapiHuffmanTable *
-gst_vaapi_huffman_table_new(
- GstVaapiDecoder *decoder,
- guint8 *data,
- guint data_size
-)
+gst_vaapi_huffman_table_new (GstVaapiDecoder * decoder,
+ guint8 * data, guint data_size)
{
- GstVaapiCodecObject *object;
-
- object = gst_vaapi_codec_object_new(
- &GstVaapiHuffmanTableClass,
- GST_VAAPI_CODEC_BASE(decoder),
- data, data_size,
- NULL, 0,
- 0
- );
- if (!object)
- return NULL;
- return GST_VAAPI_HUFFMAN_TABLE_CAST(object);
+ GstVaapiCodecObject *object;
+
+ object = gst_vaapi_codec_object_new (&GstVaapiHuffmanTableClass,
+ GST_VAAPI_CODEC_BASE (decoder), data, data_size, NULL, 0, 0);
+ if (!object)
+ return NULL;
+ return GST_VAAPI_HUFFMAN_TABLE_CAST (object);
}
#endif
diff --git a/gst-libs/gst/vaapi/gstvaapicodec_objects.h b/gst-libs/gst/vaapi/gstvaapicodec_objects.h
index 6ca268e..576eea0 100644
--- a/gst-libs/gst/vaapi/gstvaapicodec_objects.h
+++ b/gst-libs/gst/vaapi/gstvaapicodec_objects.h
@@ -43,27 +43,29 @@ typedef struct _GstVaapiHuffmanTable GstVaapiHuffmanTable;
/* XXX: remove when a common base class for decoder and encoder is available */
#define GST_VAAPI_CODEC_BASE(obj) \
- ((GstVaapiCodecBase *)(obj))
+ ((GstVaapiCodecBase *) (obj))
#define GST_VAAPI_CODEC_OBJECT(obj) \
- ((GstVaapiCodecObject *)(obj))
+ ((GstVaapiCodecObject *) (obj))
-enum {
- GST_VAAPI_CODEC_OBJECT_FLAG_CONSTRUCTED = (1 << 0),
- GST_VAAPI_CODEC_OBJECT_FLAG_LAST = (1 << 1)
+enum
+{
+ GST_VAAPI_CODEC_OBJECT_FLAG_CONSTRUCTED = (1 << 0),
+ GST_VAAPI_CODEC_OBJECT_FLAG_LAST = (1 << 1)
};
-typedef struct {
- gconstpointer param;
- guint param_size;
- gconstpointer data;
- guint data_size;
- guint flags;
+typedef struct
+{
+ gconstpointer param;
+ guint param_size;
+ gconstpointer data;
+ guint data_size;
+ guint flags;
} GstVaapiCodecObjectConstructorArgs;
typedef gboolean
-(*GstVaapiCodecObjectCreateFunc)(GstVaapiCodecObject *object,
- const GstVaapiCodecObjectConstructorArgs *args);
+(*GstVaapiCodecObjectCreateFunc)(GstVaapiCodecObject * object,
+ const GstVaapiCodecObjectConstructorArgs * args);
typedef GDestroyNotify GstVaapiCodecObjectDestroyFunc;
@@ -72,10 +74,11 @@ typedef GDestroyNotify GstVaapiCodecObjectDestroyFunc;
*
* A #GstVaapiMiniObject holding the base codec object data
*/
-struct _GstVaapiCodecObject {
- /*< private >*/
- GstVaapiMiniObject parent_instance;
- GstVaapiCodecBase *codec;
+struct _GstVaapiCodecObject
+{
+ /*< private >*/
+ GstVaapiMiniObject parent_instance;
+ GstVaapiCodecBase *codec;
};
/**
@@ -83,21 +86,22 @@ struct _GstVaapiCodecObject {
*
* The #GstVaapiCodecObject base class.
*/
-struct _GstVaapiCodecObjectClass {
- /*< private >*/
- GstVaapiMiniObjectClass parent_class;
+struct _GstVaapiCodecObjectClass
+{
+ /*< private >*/
+ GstVaapiMiniObjectClass parent_class;
- GstVaapiCodecObjectCreateFunc create;
+ GstVaapiCodecObjectCreateFunc create;
};
G_GNUC_INTERNAL
const GstVaapiCodecObjectClass *
-gst_vaapi_codec_object_get_class(GstVaapiCodecObject *object) G_GNUC_CONST;
+gst_vaapi_codec_object_get_class (GstVaapiCodecObject * object) G_GNUC_CONST;
G_GNUC_INTERNAL
GstVaapiCodecObject *
-gst_vaapi_codec_object_new(const GstVaapiCodecObjectClass *object_class,
- GstVaapiCodecBase *codec, gconstpointer param, guint param_size,
+gst_vaapi_codec_object_new (const GstVaapiCodecObjectClass * object_class,
+ GstVaapiCodecBase * codec, gconstpointer param, guint param_size,
gconstpointer data, guint data_size, guint flags);
/* ------------------------------------------------------------------------- */
@@ -105,120 +109,116 @@ gst_vaapi_codec_object_new(const GstVaapiCodecObjectClass *object_class,
/* ------------------------------------------------------------------------- */
#define GST_VAAPI_IQ_MATRIX_CAST(obj) \
- ((GstVaapiIqMatrix *)(obj))
+ ((GstVaapiIqMatrix *) (obj))
/**
* GstVaapiIqMatrix:
*
* A #GstVaapiCodecObject holding an inverse quantization matrix parameter.
*/
-struct _GstVaapiIqMatrix {
- /*< private >*/
- GstVaapiCodecObject parent_instance;
- VABufferID param_id;
-
- /*< public >*/
- gpointer param;
+struct _GstVaapiIqMatrix
+{
+ /*< private >*/
+ GstVaapiCodecObject parent_instance;
+ VABufferID param_id;
+
+ /*< public >*/
+ gpointer param;
};
G_GNUC_INTERNAL
GstVaapiIqMatrix *
-gst_vaapi_iq_matrix_new(
- GstVaapiDecoder *decoder,
- gconstpointer param,
- guint param_size
-);
+gst_vaapi_iq_matrix_new (GstVaapiDecoder * decoder, gconstpointer param,
+ guint param_size);
/* ------------------------------------------------------------------------- */
/* --- VC-1 Bit Planes --- */
/* ------------------------------------------------------------------------- */
#define GST_VAAPI_BITPLANE_CAST(obj) \
- ((GstVaapiBitPlane *)(obj))
+ ((GstVaapiBitPlane *) (obj))
/**
* GstVaapiBitPlane:
*
* A #GstVaapiCodecObject holding a VC-1 bit plane parameter.
*/
-struct _GstVaapiBitPlane {
- /*< private >*/
- GstVaapiCodecObject parent_instance;
- VABufferID data_id;
-
- /*< public >*/
- guint8 *data;
+struct _GstVaapiBitPlane
+{
+ /*< private >*/
+ GstVaapiCodecObject parent_instance;
+ VABufferID data_id;
+
+ /*< public >*/
+ guint8 *data;
};
G_GNUC_INTERNAL
GstVaapiBitPlane *
-gst_vaapi_bitplane_new(GstVaapiDecoder *decoder, guint8 *data, guint data_size);
+gst_vaapi_bitplane_new (GstVaapiDecoder * decoder, guint8 * data,
+ guint data_size);
/* ------------------------------------------------------------------------- */
/* --- JPEG Huffman Tables --- */
/* ------------------------------------------------------------------------- */
#define GST_VAAPI_HUFFMAN_TABLE_CAST(obj) \
- ((GstVaapiHuffmanTable *)(obj))
+ ((GstVaapiHuffmanTable *) (obj))
/**
* GstVaapiHuffmanTable:
*
* A #GstVaapiCodecObject holding huffman table.
*/
-struct _GstVaapiHuffmanTable {
- /*< private >*/
- GstVaapiCodecObject parent_instance;
- VABufferID param_id;
-
- /*< public >*/
- gpointer param;
+struct _GstVaapiHuffmanTable
+{
+ /*< private >*/
+ GstVaapiCodecObject parent_instance;
+ VABufferID param_id;
+
+ /*< public >*/
+ gpointer param;
};
G_GNUC_INTERNAL
GstVaapiHuffmanTable *
-gst_vaapi_huffman_table_new(
- GstVaapiDecoder *decoder,
- guint8 *data,
- guint data_size
-);
+gst_vaapi_huffman_table_new (GstVaapiDecoder * decoder, guint8 * data,
+ guint data_size);
/* ------------------------------------------------------------------------- */
/* --- Helpers to create codec-dependent objects --- */
/* ------------------------------------------------------------------------- */
-#define GST_VAAPI_CODEC_DEFINE_TYPE(type, prefix) \
-G_GNUC_INTERNAL \
-void \
-prefix##_destroy(type *); \
- \
-G_GNUC_INTERNAL \
-gboolean \
-prefix##_create( \
- type *, \
- const GstVaapiCodecObjectConstructorArgs *args \
-); \
- \
-static const GstVaapiCodecObjectClass type##Class = { \
- .parent_class = { \
- .size = sizeof(type), \
- .finalize = (GstVaapiCodecObjectDestroyFunc) \
- prefix##_destroy \
- }, \
- .create = (GstVaapiCodecObjectCreateFunc) \
- prefix##_create, \
+#define GST_VAAPI_CODEC_DEFINE_TYPE(type, prefix) \
+G_GNUC_INTERNAL \
+void \
+G_PASTE (prefix, _destroy) (type *); \
+ \
+G_GNUC_INTERNAL \
+gboolean \
+G_PASTE (prefix, _create) (type *, \
+ const GstVaapiCodecObjectConstructorArgs * args); \
+ \
+static const GstVaapiCodecObjectClass G_PASTE (type, Class) = { \
+ .parent_class = { \
+ .size = sizeof (type), \
+ .finalize = (GstVaapiCodecObjectDestroyFunc) \
+ G_PASTE (prefix, _destroy) \
+ }, \
+ .create = (GstVaapiCodecObjectCreateFunc) \
+ G_PASTE (prefix, _create), \
}
#define GST_VAAPI_IQ_MATRIX_NEW(codec, decoder) \
- gst_vaapi_iq_matrix_new(GST_VAAPI_DECODER_CAST(decoder), \
- NULL, sizeof(VAIQMatrixBuffer##codec))
+ gst_vaapi_iq_matrix_new (GST_VAAPI_DECODER_CAST (decoder), \
+ NULL, sizeof (G_PASTE (VAIQMatrixBuffer, codec)))
#define GST_VAAPI_BITPLANE_NEW(decoder, size) \
- gst_vaapi_bitplane_new(GST_VAAPI_DECODER_CAST(decoder), NULL, size)
+ gst_vaapi_bitplane_new (GST_VAAPI_DECODER_CAST (decoder), NULL, size)
#define GST_VAAPI_HUFFMAN_TABLE_NEW(codec, decoder) \
- gst_vaapi_huffman_table_new(GST_VAAPI_DECODER_CAST(decoder), \
- NULL, sizeof(VAHuffmanTableBuffer##codec))
+ gst_vaapi_huffman_table_new (GST_VAAPI_DECODER_CAST (decoder), \
+ NULL, sizeof (G_PASTE (VAHuffmanTableBuffer, codec)))
G_END_DECLS
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gstreamer-vaapi.git
More information about the Pkg-gstreamer-commits
mailing list