From 5c26862913042709c020cb1ba81ea55ec652d021 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Mon, 23 Apr 2018 09:53:51 +0200 Subject: [PATCH] buffer: Use object buffer structure directly instead of abstract type Signed-off-by: Paul Kocialkowski --- src/buffer.c | 12 ++++++------ src/buffer.h | 6 ++---- src/image.c | 2 +- src/mpeg2.c | 4 ++-- src/mpeg2.h | 4 ++-- src/mpeg4.c | 6 +++--- src/mpeg4.h | 6 +++--- src/picture.c | 2 +- src/sunxi_cedrus_drv_video.c | 6 +++--- src/texte.txt | 0 10 files changed, 23 insertions(+), 25 deletions(-) create mode 100644 src/texte.txt diff --git a/src/buffer.c b/src/buffer.c index b380016..ef2e598 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -49,7 +49,7 @@ VAStatus sunxi_cedrus_CreateBuffer(VADriverContextP ctx, VAContextID context, INIT_DRIVER_DATA int bufferID; struct v4l2_plane plane[1]; - object_buffer_p obj_buffer; + struct object_buffer *obj_buffer; memset(plane, 0, sizeof(struct v4l2_plane)); @@ -123,7 +123,7 @@ VAStatus sunxi_cedrus_BufferSetNumElements(VADriverContextP ctx, { INIT_DRIVER_DATA VAStatus vaStatus = VA_STATUS_SUCCESS; - object_buffer_p obj_buffer = BUFFER(buf_id); + struct object_buffer *obj_buffer = BUFFER(buf_id); assert(obj_buffer); if ((num_elements < 0) || (num_elements > obj_buffer->max_num_elements)) @@ -139,7 +139,7 @@ VAStatus sunxi_cedrus_MapBuffer(VADriverContextP ctx, VABufferID buf_id, { INIT_DRIVER_DATA VAStatus vaStatus = VA_STATUS_ERROR_UNKNOWN; - object_buffer_p obj_buffer = BUFFER(buf_id); + struct object_buffer *obj_buffer = BUFFER(buf_id); assert(obj_buffer); if (NULL == obj_buffer) @@ -159,7 +159,7 @@ VAStatus sunxi_cedrus_MapBuffer(VADriverContextP ctx, VABufferID buf_id, VAStatus sunxi_cedrus_UnmapBuffer(VADriverContextP ctx, VABufferID buf_id) { INIT_DRIVER_DATA - object_buffer_p obj_buffer = BUFFER(buf_id); + struct object_buffer *obj_buffer = BUFFER(buf_id); if (obj_buffer == NULL) return VA_STATUS_ERROR_INVALID_BUFFER; @@ -169,7 +169,7 @@ VAStatus sunxi_cedrus_UnmapBuffer(VADriverContextP ctx, VABufferID buf_id) } void sunxi_cedrus_destroy_buffer(struct sunxi_cedrus_driver_data *driver_data, - object_buffer_p obj_buffer) + struct object_buffer *obj_buffer) { if (obj_buffer->buffer_data != NULL) { if (obj_buffer->type != VASliceDataBufferType) @@ -187,7 +187,7 @@ void sunxi_cedrus_destroy_buffer(struct sunxi_cedrus_driver_data *driver_data, VAStatus sunxi_cedrus_DestroyBuffer(VADriverContextP ctx, VABufferID buffer_id) { INIT_DRIVER_DATA - object_buffer_p obj_buffer = BUFFER(buffer_id); + struct object_buffer *obj_buffer = BUFFER(buffer_id); assert(obj_buffer); sunxi_cedrus_destroy_buffer(driver_data, obj_buffer); diff --git a/src/buffer.h b/src/buffer.h index 82438e1..9104de9 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -31,7 +31,7 @@ #include "object_heap.h" #include "sunxi_cedrus_drv_video.h" -#define BUFFER(id) ((object_buffer_p) object_heap_lookup(&driver_data->buffer_heap, id)) +#define BUFFER(id) ((struct object_buffer *) object_heap_lookup(&driver_data->buffer_heap, id)) #define BUFFER_ID_OFFSET 0x08000000 struct object_buffer { @@ -45,8 +45,6 @@ struct object_buffer { unsigned int map_size; }; -typedef struct object_buffer *object_buffer_p; - VAStatus sunxi_cedrus_CreateBuffer(VADriverContextP ctx, VAContextID context, VABufferType type, unsigned int size, unsigned int num_elements, void *data, VABufferID *buf_id); @@ -60,7 +58,7 @@ VAStatus sunxi_cedrus_MapBuffer(VADriverContextP ctx, VABufferID buf_id, VAStatus sunxi_cedrus_UnmapBuffer(VADriverContextP ctx, VABufferID buf_id); void sunxi_cedrus_destroy_buffer(struct sunxi_cedrus_driver_data *driver_data, - object_buffer_p obj_buffer); + struct object_buffer *obj_buffer); VAStatus sunxi_cedrus_DestroyBuffer(VADriverContextP ctx, VABufferID buffer_id); diff --git a/src/image.c b/src/image.c index 1c93371..9656971 100644 --- a/src/image.c +++ b/src/image.c @@ -93,7 +93,7 @@ VAStatus sunxi_cedrus_DeriveImage(VADriverContextP ctx, VASurfaceID surface, INIT_DRIVER_DATA object_surface_p obj_surface; VAImageFormat fmt; - object_buffer_p obj_buffer; + struct object_buffer *obj_buffer; VAStatus ret; obj_surface = SURFACE(surface); diff --git a/src/mpeg2.c b/src/mpeg2.c index 06d0677..abe500f 100644 --- a/src/mpeg2.c +++ b/src/mpeg2.c @@ -41,7 +41,7 @@ VAStatus sunxi_cedrus_render_mpeg2_slice_data(VADriverContextP ctx, object_context_p obj_context, object_surface_p obj_surface, - object_buffer_p obj_buffer) + struct object_buffer *obj_buffer) { INIT_DRIVER_DATA VAStatus vaStatus = VA_STATUS_SUCCESS; @@ -54,7 +54,7 @@ VAStatus sunxi_cedrus_render_mpeg2_slice_data(VADriverContextP ctx, VAStatus sunxi_cedrus_render_mpeg2_picture_parameter(VADriverContextP ctx, object_context_p obj_context, object_surface_p obj_surface, - object_buffer_p obj_buffer) + struct object_buffer *obj_buffer) { INIT_DRIVER_DATA VAStatus vaStatus = VA_STATUS_SUCCESS; diff --git a/src/mpeg2.h b/src/mpeg2.h index 18a4d10..e10bd9e 100644 --- a/src/mpeg2.h +++ b/src/mpeg2.h @@ -35,10 +35,10 @@ VAStatus sunxi_cedrus_render_mpeg2_slice_data(VADriverContextP ctx, object_context_p obj_context, object_surface_p obj_surface, - object_buffer_p obj_buffer); + struct object_buffer *obj_buffer); VAStatus sunxi_cedrus_render_mpeg2_picture_parameter(VADriverContextP ctx, object_context_p obj_context, object_surface_p obj_surface, - object_buffer_p obj_buffer); + struct object_buffer *obj_buffer); #endif /* _MPEG2_H_ */ diff --git a/src/mpeg4.c b/src/mpeg4.c index 43e4f99..1c2d391 100644 --- a/src/mpeg4.c +++ b/src/mpeg4.c @@ -41,7 +41,7 @@ VAStatus sunxi_cedrus_render_mpeg4_slice_data(VADriverContextP ctx, object_context_p obj_context, object_surface_p obj_surface, - object_buffer_p obj_buffer) + struct object_buffer *obj_buffer) { INIT_DRIVER_DATA VAStatus vaStatus = VA_STATUS_SUCCESS; @@ -72,7 +72,7 @@ VAStatus sunxi_cedrus_render_mpeg4_slice_data(VADriverContextP ctx, VAStatus sunxi_cedrus_render_mpeg4_picture_parameter(VADriverContextP ctx, object_context_p obj_context, object_surface_p obj_surface, - object_buffer_p obj_buffer) + struct object_buffer *obj_buffer) { INIT_DRIVER_DATA VAStatus vaStatus = VA_STATUS_SUCCESS; @@ -123,7 +123,7 @@ VAStatus sunxi_cedrus_render_mpeg4_picture_parameter(VADriverContextP ctx, VAStatus sunxi_cedrus_render_mpeg4_slice_parameter(VADriverContextP ctx, object_context_p obj_context, object_surface_p obj_surface, - object_buffer_p obj_buffer) + struct object_buffer *obj_buffer) { VASliceParameterBufferMPEG4 *slice_param = (VASliceParameterBufferMPEG4 *)obj_buffer->buffer_data; diff --git a/src/mpeg4.h b/src/mpeg4.h index 0c931bb..2d1576b 100644 --- a/src/mpeg4.h +++ b/src/mpeg4.h @@ -35,14 +35,14 @@ VAStatus sunxi_cedrus_render_mpeg4_slice_data(VADriverContextP ctx, object_context_p obj_context, object_surface_p obj_surface, - object_buffer_p obj_buffer); + struct object_buffer *obj_buffer); VAStatus sunxi_cedrus_render_mpeg4_picture_parameter(VADriverContextP ctx, object_context_p obj_context, object_surface_p obj_surface, - object_buffer_p obj_buffer); + struct object_buffer *obj_buffer); VAStatus sunxi_cedrus_render_mpeg4_slice_parameter(VADriverContextP ctx, object_context_p obj_context, object_surface_p obj_surface, - object_buffer_p obj_buffer); + struct object_buffer *obj_buffer); #endif /* _MPEG4_H_ */ diff --git a/src/picture.c b/src/picture.c index 19dc709..dbc1e2b 100644 --- a/src/picture.c +++ b/src/picture.c @@ -106,7 +106,7 @@ VAStatus sunxi_cedrus_RenderPicture(VADriverContextP ctx, VAContextID context, /* verify that we got valid buffer references */ for(i = 0; i < num_buffers; i++) { - object_buffer_p obj_buffer = BUFFER(buffers[i]); + struct object_buffer *obj_buffer = BUFFER(buffers[i]); assert(obj_buffer); if (NULL == obj_buffer) { diff --git a/src/sunxi_cedrus_drv_video.c b/src/sunxi_cedrus_drv_video.c index ed0d946..f253ed3 100644 --- a/src/sunxi_cedrus_drv_video.c +++ b/src/sunxi_cedrus_drv_video.c @@ -64,7 +64,7 @@ void sunxi_cedrus_msg(const char *msg, ...) VAStatus sunxi_cedrus_Terminate(VADriverContextP ctx) { INIT_DRIVER_DATA - object_buffer_p obj_buffer; + struct object_buffer *obj_buffer; object_config_p obj_config; object_heap_iterator iter; @@ -75,12 +75,12 @@ VAStatus sunxi_cedrus_Terminate(VADriverContextP ctx) close(driver_data->mem2mem_fd); /* Clean up left over buffers */ - obj_buffer = (object_buffer_p) object_heap_first(&driver_data->buffer_heap, &iter); + obj_buffer = (struct object_buffer *) object_heap_first(&driver_data->buffer_heap, &iter); while (obj_buffer) { sunxi_cedrus_msg("vaTerminate: bufferID %08x still allocated, destroying\n", obj_buffer->base.id); sunxi_cedrus_destroy_buffer(driver_data, obj_buffer); - obj_buffer = (object_buffer_p) object_heap_next(&driver_data->buffer_heap, &iter); + obj_buffer = (struct object_buffer *) object_heap_next(&driver_data->buffer_heap, &iter); } object_heap_destroy(&driver_data->buffer_heap); diff --git a/src/texte.txt b/src/texte.txt new file mode 100644 index 0000000..e69de29