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

buffer: remove intermediate vaStatus variable

Browse Source 
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
This commit is contained in:
Maxime Ripard
2018-04-20 10:05:15 +02:00
parent 923a001e50
commit d10aec071b
1 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/buffer.c
+8 -19
View File
@@ -47,7 +47,6 @@ VAStatus sunxi_cedrus_CreateBuffer(VADriverContextP ctx, VAContextID context,
void *data, VABufferID *buf_id) void *data, VABufferID *buf_id)
{ {
INIT_DRIVER_DATA INIT_DRIVER_DATA
VAStatus vaStatus = VA_STATUS_SUCCESS;
int bufferID; int bufferID;
struct v4l2_plane plane[1]; struct v4l2_plane plane[1];
object_buffer_p obj_buffer; object_buffer_p obj_buffer;
@@ -65,20 +64,19 @@ VAStatus sunxi_cedrus_CreateBuffer(VADriverContextP ctx, VAContextID context,
/* Ok */ /* Ok */
break; break;
default: default:
vaStatus = VA_STATUS_ERROR_UNSUPPORTED_BUFFERTYPE; return VA_STATUS_ERROR_UNSUPPORTED_BUFFERTYPE;
return vaStatus;
} }
bufferID = object_heap_allocate(&driver_data->buffer_heap); bufferID = object_heap_allocate(&driver_data->buffer_heap);
obj_buffer = BUFFER(bufferID); obj_buffer = BUFFER(bufferID);
if (NULL == obj_buffer) if (obj_buffer == NULL)
{ return VA_STATUS_ERROR_ALLOCATION_FAILED;
vaStatus = VA_STATUS_ERROR_ALLOCATION_FAILED;
return vaStatus;
}
obj_buffer->buffer_data = NULL; obj_buffer->buffer_data = NULL;
obj_buffer->type = type; obj_buffer->type = type;
obj_buffer->max_num_elements = num_elements;
obj_buffer->num_elements = num_elements;
obj_buffer->size = size;
if(obj_buffer->type == VASliceDataBufferType) { if(obj_buffer->type == VASliceDataBufferType) {
object_context_p obj_context; object_context_p obj_context;
@@ -105,21 +103,12 @@ VAStatus sunxi_cedrus_CreateBuffer(VADriverContextP ctx, VAContextID context,
if (obj_buffer->buffer_data == NULL) if (obj_buffer->buffer_data == NULL)
return VA_STATUS_ERROR_ALLOCATION_FAILED; return VA_STATUS_ERROR_ALLOCATION_FAILED;
if (VA_STATUS_SUCCESS == vaStatus)
{
obj_buffer->max_num_elements = num_elements;
obj_buffer->num_elements = num_elements;
obj_buffer->size = size;
if (data) if (data)
memcpy(obj_buffer->buffer_data, data, memcpy(obj_buffer->buffer_data, data, size * num_elements);
size * num_elements);
}
if (VA_STATUS_SUCCESS == vaStatus)
*buf_id = bufferID; *buf_id = bufferID;
return vaStatus; return VA_STATUS_SUCCESS;
} }
VAStatus sunxi_cedrus_BufferSetNumElements(VADriverContextP ctx, VAStatus sunxi_cedrus_BufferSetNumElements(VADriverContextP ctx,