From 2208d57b8f3c28177cd7f3ef1af8058479f1498b Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 16 Jul 2018 14:11:18 +0200 Subject: [PATCH] h264: shorten the surface_object parameter name Using the same words but not in the same order for both the type and the variable name isn't particularly helpful, and prevents to stay within 80 characters. Shorten the name a bit. Signed-off-by: Maxime Ripard --- src/h264.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/h264.c b/src/h264.c index 4f5ee62..7cd48d0 100644 --- a/src/h264.c +++ b/src/h264.c @@ -233,7 +233,7 @@ static void h264_va_slice_to_v4l2(struct sunxi_cedrus_driver_data *driver_data, } int h264_set_controls(struct sunxi_cedrus_driver_data *driver_data, - struct object_surface *surface_object) + struct object_surface *surface) { struct v4l2_ctrl_h264_scaling_matrix matrix = { 0 }; struct v4l2_ctrl_h264_decode_param decode = { 0 }; @@ -242,37 +242,37 @@ int h264_set_controls(struct sunxi_cedrus_driver_data *driver_data, struct v4l2_ctrl_h264_sps sps = { 0 }; int rc; - h264_va_picture_to_v4l2(driver_data, &surface_object->params.h264.picture, + h264_va_picture_to_v4l2(driver_data, &surface->params.h264.picture, &decode, &pps, &sps); - h264_va_matrix_to_v4l2(driver_data, &surface_object->params.h264.matrix, &matrix); - h264_va_slice_to_v4l2(driver_data, &surface_object->params.h264.slice, - &surface_object->params.h264.picture, &slice); + h264_va_matrix_to_v4l2(driver_data, &surface->params.h264.matrix, &matrix); + h264_va_slice_to_v4l2(driver_data, &surface->params.h264.slice, + &surface->params.h264.picture, &slice); - rc = v4l2_set_control(driver_data->video_fd, surface_object->request_fd, + rc = v4l2_set_control(driver_data->video_fd, surface->request_fd, V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS, &decode, sizeof(decode)); if (rc < 0) return VA_STATUS_ERROR_OPERATION_FAILED; - rc = v4l2_set_control(driver_data->video_fd, surface_object->request_fd, + rc = v4l2_set_control(driver_data->video_fd, surface->request_fd, V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS, &slice, sizeof(slice)); if (rc < 0) return VA_STATUS_ERROR_OPERATION_FAILED; - rc = v4l2_set_control(driver_data->video_fd, surface_object->request_fd, + rc = v4l2_set_control(driver_data->video_fd, surface->request_fd, V4L2_CID_MPEG_VIDEO_H264_PPS, &pps, sizeof(pps)); if (rc < 0) return VA_STATUS_ERROR_OPERATION_FAILED; - rc = v4l2_set_control(driver_data->video_fd, surface_object->request_fd, + rc = v4l2_set_control(driver_data->video_fd, surface->request_fd, V4L2_CID_MPEG_VIDEO_H264_SPS, &sps, sizeof(sps)); if (rc < 0) return VA_STATUS_ERROR_OPERATION_FAILED; - rc = v4l2_set_control(driver_data->video_fd, surface_object->request_fd, + rc = v4l2_set_control(driver_data->video_fd, surface->request_fd, V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX, &matrix, sizeof(matrix)); if (rc < 0)