From 115b0d39b1c86a149fcce19f6bd937ed32f77b93 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 20 Apr 2018 10:45:10 +0200 Subject: [PATCH] picture: rework the test for the media request fd a bit Signed-off-by: Maxime Ripard --- src/picture.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/picture.c b/src/picture.c index 7e67d21..557180b 100644 --- a/src/picture.c +++ b/src/picture.c @@ -175,14 +175,13 @@ VAStatus sunxi_cedrus_EndPicture(VADriverContextP ctx, VAContextID context) * extended control when a buffer is queued and we don't know in which * order the different RenderPicture will be called. */ - - if(driver_data->request_fds[obj_surface->input_buf_index] < 0) { + request_fd = driver_data->request_fds[obj_surface->input_buf_index]; + if(request_fd < 0) { assert(ioctl(driver_data->mem2mem_fd, VIDIOC_NEW_REQUEST, &media_request)==0); driver_data->request_fds[obj_surface->input_buf_index] = media_request.fd; + request_fd = media_request.fd; } - request_fd = driver_data->request_fds[obj_surface->input_buf_index]; - memset(plane, 0, sizeof(struct v4l2_plane)); memset(planes, 0, 2 * sizeof(struct v4l2_plane)); memset(&ctrl, 0, sizeof(struct v4l2_ext_control));