buffer: Rename functions arguments for more clarity

Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>

1 files changed, 32 insertions, 32 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 30ef1c7..cce7ea7 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -42,12 +42,12 @@
  * (which are mmapped from v4l's kernel space)
  */
 
-VAStatus SunxiCedrusCreateBuffer(VADriverContextP ctx, VAContextID context,
-		VABufferType type, unsigned int size, unsigned int num_elements,
-		void *data, VABufferID *buf_id)
+VAStatus SunxiCedrusCreateBuffer(VADriverContextP context,
+	VAContextID context_id, VABufferType type, unsigned int size,
+	unsigned int count, void *data, VABufferID *buffer_id)
 {
 	struct sunxi_cedrus_driver_data *driver_data =
-		(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
+		(struct sunxi_cedrus_driver_data *) context->pDriverData;
 	int bufferID;
 	struct v4l2_plane plane[1];
 	struct object_buffer *obj_buffer;
@@ -73,8 +73,8 @@ VAStatus SunxiCedrusCreateBuffer(VADriverContextP ctx, VAContextID context,
 		return VA_STATUS_ERROR_ALLOCATION_FAILED;
 
 	obj_buffer->type = type;
-	obj_buffer->initial_count = num_elements;
-	obj_buffer->count = num_elements;
+	obj_buffer->initial_count = count;
+	obj_buffer->count = count;
 
 	obj_buffer->data = NULL;
 	obj_buffer->map = NULL;
@@ -84,7 +84,7 @@ VAStatus SunxiCedrusCreateBuffer(VADriverContextP ctx, VAContextID context,
 	if(obj_buffer->type == VASliceDataBufferType) {
 		struct object_context *obj_context;
 
-		obj_context = CONTEXT(context);
+		obj_context = CONTEXT(context_id);
 		assert(obj_context);
 
 		struct v4l2_buffer buf;
@@ -97,53 +97,53 @@ VAStatus SunxiCedrusCreateBuffer(VADriverContextP ctx, VAContextID context,
 
 		assert(ioctl(driver_data->mem2mem_fd, VIDIOC_QUERYBUF, &buf)==0);
 
-		obj_buffer->map_size = driver_data->slice_offset[buf.index] + size * num_elements;
+		obj_buffer->map_size = driver_data->slice_offset[buf.index] + size * count;
 		obj_buffer->map = mmap(NULL, obj_buffer->map_size,
 				PROT_READ | PROT_WRITE, MAP_SHARED,
 				driver_data->mem2mem_fd, buf.m.planes[0].m.mem_offset);
 
 		obj_buffer->data = obj_buffer->map + driver_data->slice_offset[buf.index];
-		driver_data->slice_offset[buf.index] += size * num_elements;
+		driver_data->slice_offset[buf.index] += size * count;
 	} else {
 		obj_buffer->map = NULL;
-		obj_buffer->data = malloc(size * num_elements);
+		obj_buffer->data = malloc(size * count);
 	}
 
 	if (obj_buffer->data == NULL || obj_buffer->map == MAP_FAILED)
 		return VA_STATUS_ERROR_ALLOCATION_FAILED;
 
 	if (data)
-		memcpy(obj_buffer->data, data, size * num_elements);
+		memcpy(obj_buffer->data, data, size * count);
 
-	*buf_id = bufferID;
+	*buffer_id = bufferID;
 
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusBufferSetNumElements(VADriverContextP ctx,
-		VABufferID buf_id, unsigned int num_elements)
+VAStatus SunxiCedrusBufferSetNumElements(VADriverContextP context,
+	VABufferID buffer_id, unsigned int count)
 {
 	struct sunxi_cedrus_driver_data *driver_data =
-		(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
+		(struct sunxi_cedrus_driver_data *) context->pDriverData;
 	VAStatus vaStatus = VA_STATUS_SUCCESS;
-	struct object_buffer *obj_buffer = BUFFER(buf_id);
+	struct object_buffer *obj_buffer = BUFFER(buffer_id);
 	assert(obj_buffer);
 
-	if ((num_elements < 0) || (num_elements > obj_buffer->initial_count))
+	if ((count < 0) || (count > obj_buffer->initial_count))
 		vaStatus = VA_STATUS_ERROR_UNKNOWN;
 	if (VA_STATUS_SUCCESS == vaStatus)
-		obj_buffer->count = num_elements;
+		obj_buffer->count = count;
 
 	return vaStatus;
 }
 
-VAStatus SunxiCedrusMapBuffer(VADriverContextP ctx, VABufferID buf_id,
-		void **pbuf)
+VAStatus SunxiCedrusMapBuffer(VADriverContextP context, VABufferID buffer_id,
+	void **data_map)
 {
 	struct sunxi_cedrus_driver_data *driver_data =
-		(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
+		(struct sunxi_cedrus_driver_data *) context->pDriverData;
 	VAStatus vaStatus = VA_STATUS_ERROR_UNKNOWN;
-	struct object_buffer *obj_buffer = BUFFER(buf_id);
+	struct object_buffer *obj_buffer = BUFFER(buffer_id);
 	assert(obj_buffer);
 
 	if (NULL == obj_buffer)
@@ -154,17 +154,17 @@ VAStatus SunxiCedrusMapBuffer(VADriverContextP ctx, VABufferID buf_id,
 
 	if (NULL != obj_buffer->data)
 	{
-		*pbuf = obj_buffer->data;
+		*data_map = obj_buffer->data;
 		vaStatus = VA_STATUS_SUCCESS;
 	}
 	return vaStatus;
 }
 
-VAStatus SunxiCedrusUnmapBuffer(VADriverContextP ctx, VABufferID buf_id)
+VAStatus SunxiCedrusUnmapBuffer(VADriverContextP context, VABufferID buffer_id)
 {
 	struct sunxi_cedrus_driver_data *driver_data =
-		(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
-	struct object_buffer *obj_buffer = BUFFER(buf_id);
+		(struct sunxi_cedrus_driver_data *) context->pDriverData;
+	struct object_buffer *obj_buffer = BUFFER(buffer_id);
 
 	if (obj_buffer == NULL)
 		return VA_STATUS_ERROR_INVALID_BUFFER;
@@ -174,7 +174,7 @@ VAStatus SunxiCedrusUnmapBuffer(VADriverContextP ctx, VABufferID buf_id)
 }
 
 void sunxi_cedrus_destroy_buffer(struct sunxi_cedrus_driver_data *driver_data,
-		struct object_buffer *obj_buffer)
+	struct object_buffer *obj_buffer)
 {
 	if (obj_buffer->data != NULL) {
 		if (obj_buffer->type != VASliceDataBufferType)
@@ -189,10 +189,11 @@ void sunxi_cedrus_destroy_buffer(struct sunxi_cedrus_driver_data *driver_data,
 	object_heap_free(&driver_data->buffer_heap, obj_buffer);
 }
 
-VAStatus SunxiCedrusDestroyBuffer(VADriverContextP ctx, VABufferID buffer_id)
+VAStatus SunxiCedrusDestroyBuffer(VADriverContextP context,
+	VABufferID buffer_id)
 {
 	struct sunxi_cedrus_driver_data *driver_data =
-		(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
+		(struct sunxi_cedrus_driver_data *) context->pDriverData;
 	struct object_buffer *obj_buffer = BUFFER(buffer_id);
 	assert(obj_buffer);
 
@@ -202,7 +203,6 @@ VAStatus SunxiCedrusDestroyBuffer(VADriverContextP ctx, VABufferID buffer_id)
 }
 
 /* sunxi-cedrus doesn't support buffer info */
-VAStatus SunxiCedrusBufferInfo(VADriverContextP ctx, VABufferID buf_id,
-		VABufferType *type, unsigned int *size,
-		unsigned int *num_elements)
+VAStatus SunxiCedrusBufferInfo(VADriverContextP context, VABufferID buffer_id,
+	VABufferType *type, unsigned int *size, unsigned int *count)
 { return VA_STATUS_ERROR_UNIMPLEMENTED; }