From b938824c4832e2ebe48ef78a6c816ab202db1923 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 16 Jul 2018 21:32:21 +0200 Subject: [PATCH] tree: Shorten struct sunxi_cedrus_driver_data name This long structure name makes it quite difficult to fit within the 80 characters limit. Shorten it. Signed-off-by: Maxime Ripard --- src/buffer.c | 24 ++++++++++++------------ src/buffer.h | 2 +- src/config.c | 16 ++++++++-------- src/context.c | 8 ++++---- src/h264.c | 8 ++++---- src/h264.h | 4 ++-- src/image.c | 12 ++++++------ src/mpeg2.c | 2 +- src/mpeg2.h | 4 ++-- src/picture.c | 16 ++++++++-------- src/sunxi_cedrus.c | 6 +++--- src/sunxi_cedrus.h | 2 +- src/surface.c | 16 ++++++++-------- 13 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index e13b8a3..e7c518f 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -43,8 +43,8 @@ VAStatus SunxiCedrusCreateBuffer(VADriverContextP context, VAContextID context_id, VABufferType type, unsigned int size, unsigned int count, void *data, VABufferID *buffer_id) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; struct object_buffer *buffer_object = NULL; void *buffer_data; VAStatus status; @@ -101,8 +101,8 @@ complete: VAStatus SunxiCedrusDestroyBuffer(VADriverContextP context, VABufferID buffer_id) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; struct object_buffer *buffer_object; buffer_object = BUFFER(driver_data, buffer_id); @@ -120,8 +120,8 @@ VAStatus SunxiCedrusDestroyBuffer(VADriverContextP context, VAStatus SunxiCedrusMapBuffer(VADriverContextP context, VABufferID buffer_id, void **data_map) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; struct object_buffer *buffer_object; buffer_object = BUFFER(driver_data, buffer_id); @@ -136,8 +136,8 @@ VAStatus SunxiCedrusMapBuffer(VADriverContextP context, VABufferID buffer_id, VAStatus SunxiCedrusUnmapBuffer(VADriverContextP context, VABufferID buffer_id) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; struct object_buffer *buffer_object; buffer_object = BUFFER(driver_data, buffer_id); @@ -152,8 +152,8 @@ VAStatus SunxiCedrusUnmapBuffer(VADriverContextP context, VABufferID buffer_id) VAStatus SunxiCedrusBufferSetNumElements(VADriverContextP context, VABufferID buffer_id, unsigned int count) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; struct object_buffer *buffer_object; buffer_object = BUFFER(driver_data, buffer_id); @@ -171,8 +171,8 @@ VAStatus SunxiCedrusBufferSetNumElements(VADriverContextP context, VAStatus SunxiCedrusBufferInfo(VADriverContextP context, VABufferID buffer_id, VABufferType *type, unsigned int *size, unsigned int *count) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; struct object_buffer *buffer_object; buffer_object = BUFFER(driver_data, buffer_id); diff --git a/src/buffer.h b/src/buffer.h index 108b8b2..5252caf 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -48,7 +48,7 @@ struct object_buffer { VAStatus SunxiCedrusCreateBuffer(VADriverContextP context, VAContextID context_id, VABufferType type, unsigned int size, unsigned int count, void *data, VABufferID *buffer_id); -void sunxi_cedrus_destroy_buffer(struct sunxi_cedrus_driver_data *driver_data, +void sunxi_cedrus_destroy_buffer(struct cedrus_data *driver_data, struct object_buffer *obj_buffer); VAStatus SunxiCedrusDestroyBuffer(VADriverContextP context, VABufferID buffer_id); diff --git a/src/config.c b/src/config.c index eec0a35..751271a 100644 --- a/src/config.c +++ b/src/config.c @@ -40,8 +40,8 @@ VAStatus SunxiCedrusCreateConfig(VADriverContextP context, VAProfile profile, VAEntrypoint entrypoint, VAConfigAttrib *attributes, int attributes_count, VAConfigID *config_id) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; struct object_config *config_object; VAConfigID id; int i, index; @@ -90,8 +90,8 @@ VAStatus SunxiCedrusCreateConfig(VADriverContextP context, VAProfile profile, VAStatus SunxiCedrusDestroyConfig(VADriverContextP context, VAConfigID config_id) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; struct object_config *config_object; config_object = CONFIG(driver_data, config_id); @@ -106,8 +106,8 @@ VAStatus SunxiCedrusDestroyConfig(VADriverContextP context, VAStatus SunxiCedrusQueryConfigProfiles(VADriverContextP context, VAProfile *profiles, int *profiles_count) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; unsigned int index = 0; bool found; @@ -158,8 +158,8 @@ VAStatus SunxiCedrusQueryConfigAttributes(VADriverContextP context, VAConfigID config_id, VAProfile *profile, VAEntrypoint *entrypoint, VAConfigAttrib *attributes, int *attributes_count) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; struct object_config *config_object; int i; diff --git a/src/context.c b/src/context.c index cc8f26d..56fa1ed 100644 --- a/src/context.c +++ b/src/context.c @@ -46,8 +46,8 @@ VAStatus SunxiCedrusCreateContext(VADriverContextP context, VASurfaceID *surfaces_ids, int surfaces_count, VAContextID *context_id) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; struct object_config *config_object; struct object_surface *surface_object; struct object_context *context_object = NULL; @@ -185,8 +185,8 @@ complete: VAStatus SunxiCedrusDestroyContext(VADriverContextP context, VAContextID context_id) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; struct object_context *context_object; int rc; diff --git a/src/h264.c b/src/h264.c index 7cd48d0..852f6d6 100644 --- a/src/h264.c +++ b/src/h264.c @@ -56,7 +56,7 @@ static int h264_lookup_ref_pic(VAPictureParameterBufferH264 *VAPicture, return 0; } -static void h264_va_picture_to_v4l2(struct sunxi_cedrus_driver_data *driver_data, +static void h264_va_picture_to_v4l2(struct cedrus_data *driver_data, VAPictureParameterBufferH264 *VAPicture, struct v4l2_ctrl_h264_decode_param *decode, struct v4l2_ctrl_h264_pps *pps, @@ -145,7 +145,7 @@ static void h264_va_picture_to_v4l2(struct sunxi_cedrus_driver_data *driver_data sps->flags |= V4L2_H264_SPS_FLAG_DELTA_PIC_ORDER_ALWAYS_ZERO; } -static void h264_va_matrix_to_v4l2(struct sunxi_cedrus_driver_data *driver_data, +static void h264_va_matrix_to_v4l2(struct cedrus_data *driver_data, VAIQMatrixBufferH264 *VAMatrix, struct v4l2_ctrl_h264_scaling_matrix *v4l2_matrix) { @@ -163,7 +163,7 @@ static void h264_va_matrix_to_v4l2(struct sunxi_cedrus_driver_data *driver_data, sizeof(v4l2_matrix->scaling_list_8x8[3])); } -static void h264_va_slice_to_v4l2(struct sunxi_cedrus_driver_data *driver_data, +static void h264_va_slice_to_v4l2(struct cedrus_data *driver_data, VASliceParameterBufferH264 *VASlice, VAPictureParameterBufferH264 *VAPicture, struct v4l2_ctrl_h264_slice_param *slice) @@ -232,7 +232,7 @@ static void h264_va_slice_to_v4l2(struct sunxi_cedrus_driver_data *driver_data, sizeof(factors->luma_offset)); } -int h264_set_controls(struct sunxi_cedrus_driver_data *driver_data, +int h264_set_controls(struct cedrus_data *driver_data, struct object_surface *surface) { struct v4l2_ctrl_h264_scaling_matrix matrix = { 0 }; diff --git a/src/h264.h b/src/h264.h index 160057d..49a09a0 100644 --- a/src/h264.h +++ b/src/h264.h @@ -28,9 +28,9 @@ #define _H264_H_ struct object_surface; -struct sunxi_cedrus_driver_data; +struct cedrus_data; -int h264_set_controls(struct sunxi_cedrus_driver_data *data, +int h264_set_controls(struct cedrus_data *data, struct object_surface *surface); #endif diff --git a/src/image.c b/src/image.c index e7f58de..e353463 100644 --- a/src/image.c +++ b/src/image.c @@ -38,8 +38,8 @@ VAStatus SunxiCedrusCreateImage(VADriverContextP context, VAImageFormat *format, int width, int height, VAImage *image) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; unsigned int destination_sizes[VIDEO_MAX_PLANES]; unsigned int destination_bytesperlines[VIDEO_MAX_PLANES]; unsigned int destination_planes_count; @@ -94,8 +94,8 @@ VAStatus SunxiCedrusCreateImage(VADriverContextP context, VAImageFormat *format, VAStatus SunxiCedrusDestroyImage(VADriverContextP context, VAImageID image_id) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; struct object_image *image_object; VAStatus status; @@ -115,8 +115,8 @@ VAStatus SunxiCedrusDestroyImage(VADriverContextP context, VAImageID image_id) VAStatus SunxiCedrusDeriveImage(VADriverContextP context, VASurfaceID surface_id, VAImage *image) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; struct object_surface *surface_object; struct object_buffer *buffer_object; unsigned int i; diff --git a/src/mpeg2.c b/src/mpeg2.c index f397ea3..957d9a5 100644 --- a/src/mpeg2.c +++ b/src/mpeg2.c @@ -38,7 +38,7 @@ #include "v4l2.h" -int mpeg2_set_controls(struct sunxi_cedrus_driver_data *driver_data, +int mpeg2_set_controls(struct cedrus_data *driver_data, struct object_surface *surface_object) { VAPictureParameterBufferMPEG2 *parameters = &surface_object->params.mpeg2.picture; diff --git a/src/mpeg2.h b/src/mpeg2.h index fd3e3fa..21a36cf 100644 --- a/src/mpeg2.h +++ b/src/mpeg2.h @@ -27,9 +27,9 @@ #define _MPEG2_H_ struct object_surface; -struct sunxi_cedrus_driver_data; +struct cedrus_data; -int mpeg2_set_controls(struct sunxi_cedrus_driver_data *driver_data, +int mpeg2_set_controls(struct cedrus_data *driver_data, struct object_surface *surface_object); #endif diff --git a/src/picture.c b/src/picture.c index f58e887..d5af4d5 100644 --- a/src/picture.c +++ b/src/picture.c @@ -46,7 +46,7 @@ #include "media.h" #include "utils.h" -static VAStatus codec_store_buffer(struct sunxi_cedrus_driver_data *driver_data, +static VAStatus codec_store_buffer(struct cedrus_data *driver_data, VAProfile profile, struct object_surface *surface_object, struct object_buffer *buffer_object) { @@ -117,7 +117,7 @@ static VAStatus codec_store_buffer(struct sunxi_cedrus_driver_data *driver_data, return VA_STATUS_SUCCESS; } -static VAStatus codec_set_controls(struct sunxi_cedrus_driver_data *driver_data, +static VAStatus codec_set_controls(struct cedrus_data *driver_data, VAProfile profile, struct object_surface *surface_object) { int rc; @@ -150,8 +150,8 @@ static VAStatus codec_set_controls(struct sunxi_cedrus_driver_data *driver_data, VAStatus SunxiCedrusBeginPicture(VADriverContextP context, VAContextID context_id, VASurfaceID surface_id) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; struct object_context *context_object; struct object_surface *surface_object; @@ -175,8 +175,8 @@ VAStatus SunxiCedrusBeginPicture(VADriverContextP context, VAStatus SunxiCedrusRenderPicture(VADriverContextP context, VAContextID context_id, VABufferID *buffers_ids, int buffers_count) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; struct object_context *context_object; struct object_config *config_object; struct object_surface *surface_object; @@ -212,8 +212,8 @@ VAStatus SunxiCedrusRenderPicture(VADriverContextP context, VAStatus SunxiCedrusEndPicture(VADriverContextP context, VAContextID context_id) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; struct object_context *context_object; struct object_config *config_object; struct object_surface *surface_object; diff --git a/src/sunxi_cedrus.c b/src/sunxi_cedrus.c index 29a6d2e..a01f352 100644 --- a/src/sunxi_cedrus.c +++ b/src/sunxi_cedrus.c @@ -57,7 +57,7 @@ VAStatus __attribute__((visibility("default"))) VAStatus VA_DRIVER_INIT_FUNC(VADriverContextP context) { - struct sunxi_cedrus_driver_data *driver_data; + struct cedrus_data *driver_data; struct VADriverVTable *vtable = context->vtable; struct v4l2_capability capability; VAStatus status; @@ -177,8 +177,8 @@ complete: VAStatus SunxiCedrusTerminate(VADriverContextP context) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; struct object_buffer *buffer_object; struct object_image *image_object; struct object_surface *surface_object; diff --git a/src/sunxi_cedrus.h b/src/sunxi_cedrus.h index 68a4136..74f3632 100644 --- a/src/sunxi_cedrus.h +++ b/src/sunxi_cedrus.h @@ -43,7 +43,7 @@ #define SUNXI_CEDRUS_MAX_SUBPIC_FORMATS 4 #define SUNXI_CEDRUS_MAX_DISPLAY_ATTRIBUTES 4 -struct sunxi_cedrus_driver_data { +struct cedrus_data { struct object_heap config_heap; struct object_heap context_heap; struct object_heap surface_heap; diff --git a/src/surface.c b/src/surface.c index 3bffd17..c786edf 100644 --- a/src/surface.c +++ b/src/surface.c @@ -45,8 +45,8 @@ VAStatus SunxiCedrusCreateSurfaces(VADriverContextP context, int width, int height, int format, int surfaces_count, VASurfaceID *surfaces_ids) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; struct object_surface *surface_object; struct video_format *video_format; unsigned int destination_sizes[VIDEO_MAX_PLANES]; @@ -143,8 +143,8 @@ VAStatus SunxiCedrusCreateSurfaces(VADriverContextP context, int width, VAStatus SunxiCedrusDestroySurfaces(VADriverContextP context, VASurfaceID *surfaces_ids, int surfaces_count) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; struct object_surface *surface_object; unsigned int i, j; @@ -175,8 +175,8 @@ VAStatus SunxiCedrusDestroySurfaces(VADriverContextP context, VAStatus SunxiCedrusSyncSurface(VADriverContextP context, VASurfaceID surface_id) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; struct object_surface *surface_object; VAStatus status; int request_fd = -1; @@ -247,8 +247,8 @@ complete: VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP context, VASurfaceID surface_id, VASurfaceStatus *status) { - struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) context->pDriverData; + struct cedrus_data *driver_data = + (struct cedrus_data *) context->pDriverData; struct object_surface *surface_object; surface_object = SURFACE(driver_data, surface_id);