marfrit/libva-v4l2-request-fourier
1
0
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

tree: add the driver_data parameter to the BUFFER macro as well

Browse Source 
The BUFFER macro takes an implicit driver_data argument. In order to make
it obvious that we need it, let's put it as an explicit parameter.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
This commit is contained in:
Maxime Ripard
2018-07-16 14:06:26 +02:00
parent 6194f1e7da
commit 5aa1604a6c
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/buffer.c
+6 -6
View File
@@ -64,7 +64,7 @@ VAStatus SunxiCedrusCreateBuffer(VADriverContextP context,
} }
id = object_heap_allocate(&driver_data->buffer_heap); id = object_heap_allocate(&driver_data->buffer_heap);
buffer_object = BUFFER(id); buffer_object = BUFFER(driver_data, id);
if (buffer_object == NULL) { if (buffer_object == NULL) {
status = VA_STATUS_ERROR_ALLOCATION_FAILED; status = VA_STATUS_ERROR_ALLOCATION_FAILED;
goto error; goto error;
@@ -105,7 +105,7 @@ VAStatus SunxiCedrusDestroyBuffer(VADriverContextP context,
(struct sunxi_cedrus_driver_data *) context->pDriverData; (struct sunxi_cedrus_driver_data *) context->pDriverData;
struct object_buffer *buffer_object; struct object_buffer *buffer_object;
buffer_object = BUFFER(buffer_id); buffer_object = BUFFER(driver_data, buffer_id);
if (buffer_object == NULL) if (buffer_object == NULL)
return VA_STATUS_ERROR_INVALID_BUFFER; return VA_STATUS_ERROR_INVALID_BUFFER;
@@ -124,7 +124,7 @@ VAStatus SunxiCedrusMapBuffer(VADriverContextP context, VABufferID buffer_id,
(struct sunxi_cedrus_driver_data *) context->pDriverData; (struct sunxi_cedrus_driver_data *) context->pDriverData;
struct object_buffer *buffer_object; struct object_buffer *buffer_object;
buffer_object = BUFFER(buffer_id); buffer_object = BUFFER(driver_data, buffer_id);
if (buffer_object == NULL || buffer_object->data == NULL) if (buffer_object == NULL || buffer_object->data == NULL)
return VA_STATUS_ERROR_INVALID_BUFFER; return VA_STATUS_ERROR_INVALID_BUFFER;
@@ -140,7 +140,7 @@ VAStatus SunxiCedrusUnmapBuffer(VADriverContextP context, VABufferID buffer_id)
(struct sunxi_cedrus_driver_data *) context->pDriverData; (struct sunxi_cedrus_driver_data *) context->pDriverData;
struct object_buffer *buffer_object; struct object_buffer *buffer_object;
buffer_object = BUFFER(buffer_id); buffer_object = BUFFER(driver_data, buffer_id);
if (buffer_object == NULL || buffer_object->data == NULL) if (buffer_object == NULL || buffer_object->data == NULL)
return VA_STATUS_ERROR_INVALID_BUFFER; return VA_STATUS_ERROR_INVALID_BUFFER;
@@ -156,7 +156,7 @@ VAStatus SunxiCedrusBufferSetNumElements(VADriverContextP context,
(struct sunxi_cedrus_driver_data *) context->pDriverData; (struct sunxi_cedrus_driver_data *) context->pDriverData;
struct object_buffer *buffer_object; struct object_buffer *buffer_object;
buffer_object = BUFFER(buffer_id); buffer_object = BUFFER(driver_data, buffer_id);
if (buffer_object == NULL) if (buffer_object == NULL)
return VA_STATUS_ERROR_INVALID_BUFFER; return VA_STATUS_ERROR_INVALID_BUFFER;
@@ -175,7 +175,7 @@ VAStatus SunxiCedrusBufferInfo(VADriverContextP context, VABufferID buffer_id,
(struct sunxi_cedrus_driver_data *) context->pDriverData; (struct sunxi_cedrus_driver_data *) context->pDriverData;
struct object_buffer *buffer_object; struct object_buffer *buffer_object;
buffer_object = BUFFER(buffer_id); buffer_object = BUFFER(driver_data, buffer_id);
if (buffer_object == NULL) if (buffer_object == NULL)
return VA_STATUS_ERROR_INVALID_BUFFER; return VA_STATUS_ERROR_INVALID_BUFFER;
src/buffer.h
+1 -1
View File
@@ -31,7 +31,7 @@
#include "object_heap.h" #include "object_heap.h"
#include "sunxi_cedrus.h" #include "sunxi_cedrus.h"
#define BUFFER(id) ((struct object_buffer *) object_heap_lookup(&driver_data->buffer_heap, id)) #define BUFFER(data, id) ((struct object_buffer *) object_heap_lookup(&(data)->buffer_heap, id))
#define BUFFER_ID_OFFSET 0x08000000 #define BUFFER_ID_OFFSET 0x08000000
struct object_buffer { struct object_buffer {
src/image.c
+1 -1
View File
@@ -141,7 +141,7 @@ VAStatus SunxiCedrusDeriveImage(VADriverContextP context,
if (status != VA_STATUS_SUCCESS) if (status != VA_STATUS_SUCCESS)
return status; return status;
buffer_object = BUFFER(image->buf); buffer_object = BUFFER(driver_data, image->buf);
if (buffer_object == NULL) if (buffer_object == NULL)
return VA_STATUS_ERROR_INVALID_BUFFER; return VA_STATUS_ERROR_INVALID_BUFFER;
src/picture.c
+1 -1
View File
@@ -197,7 +197,7 @@ VAStatus SunxiCedrusRenderPicture(VADriverContextP context,
return VA_STATUS_ERROR_INVALID_SURFACE; return VA_STATUS_ERROR_INVALID_SURFACE;
for (i = 0; i < buffers_count; i++) { for (i = 0; i < buffers_count; i++) {
buffer_object = BUFFER(buffers_ids[i]); buffer_object = BUFFER(driver_data, buffers_ids[i]);
if (buffer_object == NULL) if (buffer_object == NULL)
return VA_STATUS_ERROR_INVALID_BUFFER; return VA_STATUS_ERROR_INVALID_BUFFER;