From b0a802364421c6f8f7830600e01451c647fdeb84 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Mon, 23 Apr 2018 10:34:30 +0200 Subject: [PATCH] Remove INIT_DRIVER_DATA and replace it with explicit definition Signed-off-by: Paul Kocialkowski --- src/buffer.c | 15 ++++++++++----- src/context.c | 6 ++++-- src/image.c | 9 ++++++--- src/mpeg2.c | 6 ++++-- src/mpeg4.c | 6 ++++-- src/picture.c | 9 ++++++--- src/sunxi_cedrus.c | 6 ++++-- src/sunxi_cedrus.h | 8 +++----- src/surface.c | 15 ++++++++++----- src/va_config.c | 12 ++++++++---- 10 files changed, 59 insertions(+), 33 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index c099200..3082a56 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -46,7 +46,8 @@ VAStatus sunxi_cedrus_CreateBuffer(VADriverContextP ctx, VAContextID context, VABufferType type, unsigned int size, unsigned int num_elements, void *data, VABufferID *buf_id) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; int bufferID; struct v4l2_plane plane[1]; struct object_buffer *obj_buffer; @@ -121,7 +122,8 @@ VAStatus sunxi_cedrus_CreateBuffer(VADriverContextP ctx, VAContextID context, VAStatus sunxi_cedrus_BufferSetNumElements(VADriverContextP ctx, VABufferID buf_id, unsigned int num_elements) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; VAStatus vaStatus = VA_STATUS_SUCCESS; struct object_buffer *obj_buffer = BUFFER(buf_id); assert(obj_buffer); @@ -137,7 +139,8 @@ VAStatus sunxi_cedrus_BufferSetNumElements(VADriverContextP ctx, VAStatus sunxi_cedrus_MapBuffer(VADriverContextP ctx, VABufferID buf_id, void **pbuf) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; VAStatus vaStatus = VA_STATUS_ERROR_UNKNOWN; struct object_buffer *obj_buffer = BUFFER(buf_id); assert(obj_buffer); @@ -158,7 +161,8 @@ VAStatus sunxi_cedrus_MapBuffer(VADriverContextP ctx, VABufferID buf_id, VAStatus sunxi_cedrus_UnmapBuffer(VADriverContextP ctx, VABufferID buf_id) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; struct object_buffer *obj_buffer = BUFFER(buf_id); if (obj_buffer == NULL) @@ -186,7 +190,8 @@ void sunxi_cedrus_destroy_buffer(struct sunxi_cedrus_driver_data *driver_data, VAStatus sunxi_cedrus_DestroyBuffer(VADriverContextP ctx, VABufferID buffer_id) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; struct object_buffer *obj_buffer = BUFFER(buffer_id); assert(obj_buffer); diff --git a/src/context.c b/src/context.c index d219e59..802d026 100644 --- a/src/context.c +++ b/src/context.c @@ -49,7 +49,8 @@ VAStatus sunxi_cedrus_CreateContext(VADriverContextP ctx, VAConfigID config_id, VASurfaceID *render_targets, int num_render_targets, VAContextID *context) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; VAStatus vaStatus = VA_STATUS_SUCCESS; struct object_config *obj_config; int i; @@ -153,7 +154,8 @@ VAStatus sunxi_cedrus_CreateContext(VADriverContextP ctx, VAConfigID config_id, VAStatus sunxi_cedrus_DestroyContext(VADriverContextP ctx, VAContextID context) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; struct object_context *obj_context = CONTEXT(context); assert(obj_context); enum v4l2_buf_type type; diff --git a/src/image.c b/src/image.c index 8dd1e4b..b7b501a 100644 --- a/src/image.c +++ b/src/image.c @@ -50,7 +50,8 @@ VAStatus sunxi_cedrus_QueryImageFormats(VADriverContextP ctx, VAStatus sunxi_cedrus_CreateImage(VADriverContextP ctx, VAImageFormat *format, int width, int height, VAImage *image) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; int sizeY, sizeUV; struct object_image *obj_img; @@ -90,7 +91,8 @@ VAStatus sunxi_cedrus_CreateImage(VADriverContextP ctx, VAImageFormat *format, VAStatus sunxi_cedrus_DeriveImage(VADriverContextP ctx, VASurfaceID surface, VAImage *image) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; struct object_surface *obj_surface; VAImageFormat fmt; struct object_buffer *obj_buffer; @@ -119,7 +121,8 @@ VAStatus sunxi_cedrus_DeriveImage(VADriverContextP ctx, VASurfaceID surface, VAStatus sunxi_cedrus_DestroyImage(VADriverContextP ctx, VAImageID image) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; struct object_image *obj_img; obj_img = IMAGE(image); diff --git a/src/mpeg2.c b/src/mpeg2.c index a5dfdc7..1a39873 100644 --- a/src/mpeg2.c +++ b/src/mpeg2.c @@ -43,7 +43,8 @@ VAStatus sunxi_cedrus_render_mpeg2_slice_data(VADriverContextP ctx, struct object_context *obj_context, struct object_surface *obj_surface, struct object_buffer *obj_buffer) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; VAStatus vaStatus = VA_STATUS_SUCCESS; struct v4l2_buffer buf; struct v4l2_plane plane[1]; @@ -56,7 +57,8 @@ VAStatus sunxi_cedrus_render_mpeg2_picture_parameter(VADriverContextP ctx, struct object_context *obj_context, struct object_surface *obj_surface, struct object_buffer *obj_buffer) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; VAStatus vaStatus = VA_STATUS_SUCCESS; VAPictureParameterBufferMPEG2 *pic_param = (VAPictureParameterBufferMPEG2 *)obj_buffer->buffer_data; diff --git a/src/mpeg4.c b/src/mpeg4.c index f3cbbe3..b422811 100644 --- a/src/mpeg4.c +++ b/src/mpeg4.c @@ -43,7 +43,8 @@ VAStatus sunxi_cedrus_render_mpeg4_slice_data(VADriverContextP ctx, struct object_context *obj_context, struct object_surface *obj_surface, struct object_buffer *obj_buffer) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; VAStatus vaStatus = VA_STATUS_SUCCESS; struct v4l2_buffer buf; struct v4l2_plane plane[1]; @@ -74,7 +75,8 @@ VAStatus sunxi_cedrus_render_mpeg4_picture_parameter(VADriverContextP ctx, struct object_context *obj_context, struct object_surface *obj_surface, struct object_buffer *obj_buffer) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; VAStatus vaStatus = VA_STATUS_SUCCESS; VAPictureParameterBufferMPEG4 *pic_param = (VAPictureParameterBufferMPEG4 *)obj_buffer->buffer_data; diff --git a/src/picture.c b/src/picture.c index 32579be..0d27f9b 100644 --- a/src/picture.c +++ b/src/picture.c @@ -53,7 +53,8 @@ VAStatus sunxi_cedrus_BeginPicture(VADriverContextP ctx, VAContextID context, VASurfaceID render_target) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; VAStatus vaStatus = VA_STATUS_SUCCESS; struct object_context *obj_context; struct object_surface *obj_surface; @@ -83,7 +84,8 @@ VAStatus sunxi_cedrus_BeginPicture(VADriverContextP ctx, VAContextID context, VAStatus sunxi_cedrus_RenderPicture(VADriverContextP ctx, VAContextID context, VABufferID *buffers, int num_buffers) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; VAStatus vaStatus = VA_STATUS_SUCCESS; struct object_context *obj_context; struct object_surface *obj_surface; @@ -142,7 +144,8 @@ VAStatus sunxi_cedrus_RenderPicture(VADriverContextP ctx, VAContextID context, VAStatus sunxi_cedrus_EndPicture(VADriverContextP ctx, VAContextID context) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; VAStatus vaStatus = VA_STATUS_SUCCESS; struct object_context *obj_context; struct object_surface *obj_surface; diff --git a/src/sunxi_cedrus.c b/src/sunxi_cedrus.c index 432094c..08c1716 100644 --- a/src/sunxi_cedrus.c +++ b/src/sunxi_cedrus.c @@ -63,7 +63,8 @@ void sunxi_cedrus_msg(const char *msg, ...) /* Free memory and close v4l device */ VAStatus sunxi_cedrus_Terminate(VADriverContextP ctx) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; struct object_buffer *obj_buffer; struct object_config *obj_config; object_heap_iterator iter; @@ -169,7 +170,8 @@ VAStatus VA_DRIVER_INIT_FUNC(VADriverContextP ctx) vtable->vaUnlockSurface = sunxi_cedrus_UnlockSurface; vtable->vaBufferInfo = sunxi_cedrus_BufferInfo; - driver_data = (struct sunxi_cedrus_driver_data *) malloc(sizeof(*driver_data)); + driver_data = + (struct sunxi_cedrus_driver_data *) malloc(sizeof(*driver_data)); ctx->pDriverData = (void *) driver_data; assert(object_heap_init(&driver_data->config_heap, diff --git a/src/sunxi_cedrus.h b/src/sunxi_cedrus.h index f115bdf..08dce45 100644 --- a/src/sunxi_cedrus.h +++ b/src/sunxi_cedrus.h @@ -23,8 +23,8 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef _SUNXI_CEDRUS_DRV_VIDEO_H_ -#define _SUNXI_CEDRUS_DRV_VIDEO_H_ +#ifndef _SUNXI_CEDRUS_H_ +#define _SUNXI_CEDRUS_H_ #include #include "object_heap.h" @@ -32,8 +32,6 @@ #include -#define INIT_DRIVER_DATA struct sunxi_cedrus_driver_data * const driver_data = (struct sunxi_cedrus_driver_data *) ctx->pDriverData; - #define SUNXI_CEDRUS_STR_VENDOR "Sunxi Cedrus Driver 1.0" #define SUNXI_CEDRUS_MAX_PROFILES 11 @@ -59,4 +57,4 @@ struct sunxi_cedrus_driver_data { int slice_offset[INPUT_BUFFERS_NB]; }; -#endif /* _SUNXI_CEDRUS_DRV_VIDEO_H_ */ +#endif /* _SUNXI_CEDRUS_H_ */ diff --git a/src/surface.c b/src/surface.c index d133496..503c38a 100644 --- a/src/surface.c +++ b/src/surface.c @@ -55,7 +55,8 @@ VAStatus sunxi_cedrus_CreateSurfaces(VADriverContextP ctx, int width, int height, int format, int num_surfaces, VASurfaceID *surfaces) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; VAStatus vaStatus = VA_STATUS_SUCCESS; int i; struct v4l2_buffer buf; @@ -144,7 +145,8 @@ VAStatus sunxi_cedrus_CreateSurfaces(VADriverContextP ctx, int width, VAStatus sunxi_cedrus_DestroySurfaces(VADriverContextP ctx, VASurfaceID *surface_list, int num_surfaces) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; int i; for(i = num_surfaces; i--;) { @@ -158,7 +160,8 @@ VAStatus sunxi_cedrus_DestroySurfaces(VADriverContextP ctx, VAStatus sunxi_cedrus_SyncSurface(VADriverContextP ctx, VASurfaceID render_target) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; struct object_surface *obj_surface; struct v4l2_buffer buf; struct v4l2_plane plane[1]; @@ -225,7 +228,8 @@ VAStatus sunxi_cedrus_SyncSurface(VADriverContextP ctx, VAStatus sunxi_cedrus_QuerySurfaceStatus(VADriverContextP ctx, VASurfaceID render_target, VASurfaceStatus *status) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; VAStatus vaStatus = VA_STATUS_SUCCESS; struct object_surface *obj_surface; @@ -245,7 +249,8 @@ VAStatus sunxi_cedrus_PutSurface(VADriverContextP ctx, VASurfaceID surface, VARectangle *cliprects, unsigned int number_cliprects, unsigned int flags) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; GC gc; Display *display; const XID xid = (XID)(uintptr_t)draw; diff --git a/src/va_config.c b/src/va_config.c index 9f0a8b7..2147f30 100644 --- a/src/va_config.c +++ b/src/va_config.c @@ -42,7 +42,8 @@ VAStatus sunxi_cedrus_QueryConfigProfiles(VADriverContextP ctx, VAProfile *profile_list, int *num_profiles) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; int i = 0; struct v4l2_fmtdesc vid_fmtdesc; memset(&vid_fmtdesc, 0, sizeof(vid_fmtdesc)); @@ -152,7 +153,8 @@ VAStatus sunxi_cedrus_CreateConfig(VADriverContextP ctx, VAProfile profile, VAEntrypoint entrypoint, VAConfigAttrib *attrib_list, int num_attribs, VAConfigID *config_id) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; VAStatus vaStatus; int configID; struct object_config *obj_config; @@ -218,7 +220,8 @@ VAStatus sunxi_cedrus_CreateConfig(VADriverContextP ctx, VAProfile profile, VAStatus sunxi_cedrus_DestroyConfig(VADriverContextP ctx, VAConfigID config_id) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; VAStatus vaStatus; struct object_config *obj_config; @@ -238,7 +241,8 @@ VAStatus sunxi_cedrus_QueryConfigAttributes(VADriverContextP ctx, VAEntrypoint *entrypoint, VAConfigAttrib *attrib_list, int *num_attribs) { - INIT_DRIVER_DATA + struct sunxi_cedrus_driver_data *driver_data = + (struct sunxi_cedrus_driver_data *) ctx->pDriverData; VAStatus vaStatus = VA_STATUS_SUCCESS; struct object_config *obj_config; int i;