From a8c191b5443cb1615c6f6889778a4cc9580403c8 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Tue, 24 Apr 2018 16:40:42 +0200 Subject: [PATCH] Rename mem2mem_fd to video_fd to prepare for media introduction Signed-off-by: Paul Kocialkowski --- src/buffer.c | 4 ++-- src/config.c | 2 +- src/context.c | 10 +++++----- src/picture.c | 8 ++++---- src/sunxi_cedrus.c | 6 +++--- src/sunxi_cedrus.h | 2 +- src/surface.c | 14 +++++++------- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index a3980f8..7059e85 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -82,7 +82,7 @@ VAStatus SunxiCedrusCreateBuffer(VADriverContextP context, goto error; } - rc = v4l2_request_buffer(driver_data->mem2mem_fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, context_object->num_rendered_surfaces % INPUT_BUFFERS_NB, &length, &offset); + rc = v4l2_request_buffer(driver_data->video_fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, context_object->num_rendered_surfaces % INPUT_BUFFERS_NB, &length, &offset); if (rc < 0) { status = VA_STATUS_ERROR_ALLOCATION_FAILED; goto error; @@ -90,7 +90,7 @@ VAStatus SunxiCedrusCreateBuffer(VADriverContextP context, map_size = driver_data->slice_offset[buf.index] + size * count; map_data = mmap(NULL, map_size, PROT_READ | PROT_WRITE, MAP_SHARED, - driver_data->mem2mem_fd, offset); + driver_data->video_fd, offset); buffer_data = map_data + driver_data->slice_offset[buf.index]; driver_data->slice_offset[buf.index] += size * count; diff --git a/src/config.c b/src/config.c index e706dcd..ce13c1a 100644 --- a/src/config.c +++ b/src/config.c @@ -105,7 +105,7 @@ VAStatus SunxiCedrusQueryConfigProfiles(VADriverContextP context, unsigned int index = 0; bool found; - found = v4l2_find_format(driver_data->mem2mem_fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, V4L2_PIX_FMT_MPEG2_FRAME); + found = v4l2_find_format(driver_data->video_fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, V4L2_PIX_FMT_MPEG2_FRAME); if (found && index < (SUNXI_CEDRUS_MAX_CONFIG_ATTRIBUTES - 2)) { profiles[index++] = VAProfileMPEG2Simple; profiles[index++] = VAProfileMPEG2Main; diff --git a/src/context.c b/src/context.c index 9996bbc..398f0b4 100644 --- a/src/context.c +++ b/src/context.c @@ -93,7 +93,7 @@ VAStatus SunxiCedrusCreateContext(VADriverContextP context, return VA_STATUS_ERROR_UNSUPPORTED_PROFILE; } - rc = v4l2_set_format(driver_data->mem2mem_fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, pixelformat, picture_width, picture_height); + rc = v4l2_set_format(driver_data->video_fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, pixelformat, picture_width, picture_height); if (rc < 0) { status = VA_STATUS_ERROR_OPERATION_FAILED; goto error; @@ -105,13 +105,13 @@ VAStatus SunxiCedrusCreateContext(VADriverContextP context, goto error; } - rc = v4l2_set_stream(driver_data->mem2mem_fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, true); + rc = v4l2_set_stream(driver_data->video_fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, true); if (rc < 0) { status = VA_STATUS_ERROR_OPERATION_FAILED; goto error; } - rc = v4l2_set_stream(driver_data->mem2mem_fd, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, true); + rc = v4l2_set_stream(driver_data->video_fd, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, true); if (rc < 0) { status = VA_STATUS_ERROR_OPERATION_FAILED; goto error; @@ -149,11 +149,11 @@ VAStatus SunxiCedrusDestroyContext(VADriverContextP context, object_heap_free(&driver_data->context_heap, (struct object_base *) context_object); - rc = v4l2_set_stream(driver_data->mem2mem_fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, false); + rc = v4l2_set_stream(driver_data->video_fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, false); if (rc < 0) return VA_STATUS_ERROR_OPERATION_FAILED; - rc = v4l2_set_stream(driver_data->mem2mem_fd, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, false); + rc = v4l2_set_stream(driver_data->video_fd, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, false); if (rc < 0) return VA_STATUS_ERROR_OPERATION_FAILED; diff --git a/src/picture.c b/src/picture.c index 57c3e44..30fc5e6 100644 --- a/src/picture.c +++ b/src/picture.c @@ -156,7 +156,7 @@ VAStatus SunxiCedrusEndPicture(VADriverContextP context, request_fd = driver_data->request_fds[surface_object->input_buf_index]; if (request_fd < 0) { - rc = ioctl(driver_data->mem2mem_fd, VIDIOC_NEW_REQUEST, &media_request); + rc = ioctl(driver_data->video_fd, VIDIOC_NEW_REQUEST, &media_request); if (rc < 0) return VA_STATUS_ERROR_OPERATION_FAILED; @@ -179,15 +179,15 @@ VAStatus SunxiCedrusEndPicture(VADriverContextP context, return VA_STATUS_ERROR_UNSUPPORTED_PROFILE; } - rc = v4l2_set_control(driver_data->mem2mem_fd, request_fd, control_id, control_data, control_size); + rc = v4l2_set_control(driver_data->video_fd, request_fd, control_id, control_data, control_size); if (rc < 0) return VA_STATUS_ERROR_OPERATION_FAILED; - rc = v4l2_queue_buffer(driver_data->mem2mem_fd, request_fd, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, surface_object->output_buf_index, 0); + rc = v4l2_queue_buffer(driver_data->video_fd, request_fd, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, surface_object->output_buf_index, 0); if (rc < 0) return VA_STATUS_ERROR_OPERATION_FAILED; - rc = v4l2_queue_buffer(driver_data->mem2mem_fd, request_fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, surface_object->input_buf_index, driver_data->slice_offset[surface_object->input_buf_index]); + rc = v4l2_queue_buffer(driver_data->video_fd, request_fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, surface_object->input_buf_index, driver_data->slice_offset[surface_object->input_buf_index]); if (rc < 0) return VA_STATUS_ERROR_OPERATION_FAILED; diff --git a/src/sunxi_cedrus.c b/src/sunxi_cedrus.c index 752384e..abc042a 100644 --- a/src/sunxi_cedrus.c +++ b/src/sunxi_cedrus.c @@ -149,13 +149,13 @@ VAStatus VA_DRIVER_INIT_FUNC(VADriverContextP context) if (fd < 0) return VA_STATUS_ERROR_OPERATION_FAILED; - rc = ioctl(driver_data->mem2mem_fd, VIDIOC_QUERYCAP, &capability); + rc = ioctl(driver_data->video_fd, VIDIOC_QUERYCAP, &capability); if (rc < 0 || !(capability.capabilities & V4L2_CAP_VIDEO_M2M_MPLANE)) { sunxi_cedrus_msg("%s does not support m2m mplanes\n", path); return VA_STATUS_ERROR_OPERATION_FAILED; } - driver_data->mem2mem_fd = fd; + driver_data->video_fd = fd; for (i = 0; i < INPUT_BUFFERS_NB; i++) { driver_data->request_fds[i] = -1; @@ -191,7 +191,7 @@ VAStatus SunxiCedrusTerminate(VADriverContextP context) if (driver_data->request_fds[i] >= 0) close(driver_data->request_fds[i]); - close(driver_data->mem2mem_fd); + close(driver_data->video_fd); /* Cleanup leftover buffers. */ diff --git a/src/sunxi_cedrus.h b/src/sunxi_cedrus.h index 5e7e560..15c1500 100644 --- a/src/sunxi_cedrus.h +++ b/src/sunxi_cedrus.h @@ -50,7 +50,7 @@ struct sunxi_cedrus_driver_data { char *luma_bufs[VIDEO_MAX_FRAME]; char *chroma_bufs[VIDEO_MAX_FRAME]; unsigned int num_dst_bufs; - int mem2mem_fd; + int video_fd; int request_fds[INPUT_BUFFERS_NB]; int slice_offset[INPUT_BUFFERS_NB]; }; diff --git a/src/surface.c b/src/surface.c index 4209331..c6e1014 100644 --- a/src/surface.c +++ b/src/surface.c @@ -54,11 +54,11 @@ VAStatus SunxiCedrusCreateSurfaces(VADriverContextP context, int width, if (format != VA_RT_FORMAT_YUV420) return VA_STATUS_ERROR_UNSUPPORTED_RT_FORMAT; - rc = v4l2_set_format(driver_data->mem2mem_fd, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, V4L2_PIX_FMT_SUNXI, width, height); + rc = v4l2_set_format(driver_data->video_fd, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, V4L2_PIX_FMT_SUNXI, width, height); if (rc < 0) return VA_STATUS_ERROR_OPERATION_FAILED; - rc = v4l2_create_buffers(driver_data->mem2mem_fd, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, surfaces_count); + rc = v4l2_create_buffers(driver_data->video_fd, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, surfaces_count); if (rc < 0) return VA_STATUS_ERROR_ALLOCATION_FAILED; @@ -70,17 +70,17 @@ VAStatus SunxiCedrusCreateSurfaces(VADriverContextP context, int width, surfaces[i] = surfaceID; - rc = v4l2_request_buffer(driver_data->mem2mem_fd, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, i, length, offset); + rc = v4l2_request_buffer(driver_data->video_fd, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, i, length, offset); if (rc < 0) return VA_STATUS_ERROR_ALLOCATION_FAILED; driver_data->luma_bufs[index] = mmap(NULL, length[0], PROT_READ | PROT_WRITE, MAP_SHARED, - driver_data->mem2mem_fd, offset[0]); + driver_data->video_fd, offset[0]); if (driver_data->luma_bufs[buf.index] == MAP_FAILED) return VA_STATUS_ERROR_ALLOCATION_FAILED; driver_data->chroma_bufs[index] = mmap(NULL, length[1], PROT_READ | PROT_WRITE, MAP_SHARED, - driver_data->mem2mem_fd, offset[1]); + driver_data->video_fd, offset[1]); if (driver_data->chroma_bufs[index] == MAP_FAILED) return VA_STATUS_ERROR_ALLOCATION_FAILED; @@ -153,11 +153,11 @@ VAStatus SunxiCedrusSyncSurface(VADriverContextP context, if (rc < 0) return VA_STATUS_ERROR_OPERATION_FAILED; - rc = v4l2_dequeue_buffer(driver_data->mem2mem_fd, request_fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, surface_object->input_buf_index); + rc = v4l2_dequeue_buffer(driver_data->video_fd, request_fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, surface_object->input_buf_index); if (rc < 0) return VA_STATUS_ERROR_OPERATION_FAILED; - rc = v4l2_dequeue_buffer(driver_data->mem2mem_fd, request_fd, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, surface_object->output_buf_index); + rc = v4l2_dequeue_buffer(driver_data->video_fd, request_fd, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, surface_object->output_buf_index); if (rc < 0) return VA_STATUS_ERROR_OPERATION_FAILED;