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

surface: Close request fd on error

Browse Source 
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
This commit is contained in:
Paul Kocialkowski
2018-04-25 14:01:27 +02:00
parent 3049a90d7e
commit 0db4f300a4
1 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/surface.c
+43 -18
View File
@@ -143,45 +143,70 @@ VAStatus SunxiCedrusSyncSurface(VADriverContextP context,
struct sunxi_cedrus_driver_data *driver_data = struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) context->pDriverData; (struct sunxi_cedrus_driver_data *) context->pDriverData;
struct object_surface *surface_object; struct object_surface *surface_object;
int request_fd; VAStatus status;
int request_fd = -1;
int rc; int rc;
surface_object = SURFACE(surface_id); surface_object = SURFACE(surface_id);
if (surface_object == NULL) if (surface_object == NULL) {
return VA_STATUS_ERROR_INVALID_SURFACE; status = VA_STATUS_ERROR_INVALID_SURFACE;
goto error;
}
if (surface_object->status == VASurfaceSkipped) if (surface_object->status == VASurfaceSkipped) {
return VA_STATUS_ERROR_UNKNOWN; status = VA_STATUS_ERROR_UNKNOWN;
goto error;
}
request_fd = surface_object->request_fd; request_fd = surface_object->request_fd;
if (request_fd < 0) if (request_fd < 0) {
return VA_STATUS_ERROR_UNKNOWN; status = VA_STATUS_ERROR_OPERATION_FAILED;
goto error;
}
rc = media_request_queue(request_fd); rc = media_request_queue(request_fd);
if (rc < 0) if (rc < 0) {
return VA_STATUS_ERROR_OPERATION_FAILED; status = VA_STATUS_ERROR_OPERATION_FAILED;
goto error;
}
rc = media_request_wait_completion(request_fd); rc = media_request_wait_completion(request_fd);
if (rc < 0) { if (rc < 0) {
media_request_reinit(request_fd); status = VA_STATUS_ERROR_OPERATION_FAILED;
return VA_STATUS_ERROR_OPERATION_FAILED; goto error;
} }
rc = media_request_reinit(request_fd); rc = media_request_reinit(request_fd);
if (rc < 0) if (rc < 0) {
return VA_STATUS_ERROR_OPERATION_FAILED; status = VA_STATUS_ERROR_OPERATION_FAILED;
goto error;
}
rc = v4l2_dequeue_buffer(driver_data->video_fd, request_fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, surface_object->source_index); rc = v4l2_dequeue_buffer(driver_data->video_fd, request_fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, surface_object->source_index);
if (rc < 0) if (rc < 0) {
return VA_STATUS_ERROR_OPERATION_FAILED; status = VA_STATUS_ERROR_OPERATION_FAILED;
goto error;
}
rc = v4l2_dequeue_buffer(driver_data->video_fd, request_fd, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, surface_object->destination_index); rc = v4l2_dequeue_buffer(driver_data->video_fd, request_fd, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, surface_object->destination_index);
if (rc < 0) if (rc < 0) {
return VA_STATUS_ERROR_OPERATION_FAILED; status = VA_STATUS_ERROR_OPERATION_FAILED;
goto error;
}
surface_object->status = VASurfaceReady; surface_object->status = VASurfaceReady;
return VA_STATUS_SUCCESS; status = VA_STATUS_SUCCESS;
goto complete;
error:
if (request_fd >= 0) {
close(request_fd);
surface_object->request_fd = -1;
}
complete:
return status;
} }
VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP context, VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP context,