From d8a51f0cd439321b1eae658176240a86f5ba95b3 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Mon, 23 Apr 2018 10:49:24 +0200 Subject: [PATCH] Use libVA naming style for public API functions Signed-off-by: Paul Kocialkowski --- src/buffer.c | 12 +++---- src/buffer.h | 12 +++---- src/context.c | 4 +-- src/context.h | 4 +-- src/image.c | 22 ++++++------ src/image.h | 14 ++++---- src/picture.c | 8 ++--- src/picture.h | 6 ++-- src/subpicture.c | 18 +++++----- src/subpicture.h | 18 +++++----- src/sunxi_cedrus.c | 90 +++++++++++++++++++++++----------------------- src/surface.c | 14 ++++---- src/surface.h | 14 ++++---- src/va_config.c | 20 +++++------ src/va_config.h | 20 +++++------ 15 files changed, 138 insertions(+), 138 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index 3082a56..02402d7 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -42,7 +42,7 @@ * (which are mmapped from v4l's kernel space) */ -VAStatus sunxi_cedrus_CreateBuffer(VADriverContextP ctx, VAContextID context, +VAStatus SunxiCedrusCreateBuffer(VADriverContextP ctx, VAContextID context, VABufferType type, unsigned int size, unsigned int num_elements, void *data, VABufferID *buf_id) { @@ -119,7 +119,7 @@ VAStatus sunxi_cedrus_CreateBuffer(VADriverContextP ctx, VAContextID context, return VA_STATUS_SUCCESS; } -VAStatus sunxi_cedrus_BufferSetNumElements(VADriverContextP ctx, +VAStatus SunxiCedrusBufferSetNumElements(VADriverContextP ctx, VABufferID buf_id, unsigned int num_elements) { struct sunxi_cedrus_driver_data *driver_data = @@ -136,7 +136,7 @@ VAStatus sunxi_cedrus_BufferSetNumElements(VADriverContextP ctx, return vaStatus; } -VAStatus sunxi_cedrus_MapBuffer(VADriverContextP ctx, VABufferID buf_id, +VAStatus SunxiCedrusMapBuffer(VADriverContextP ctx, VABufferID buf_id, void **pbuf) { struct sunxi_cedrus_driver_data *driver_data = @@ -159,7 +159,7 @@ VAStatus sunxi_cedrus_MapBuffer(VADriverContextP ctx, VABufferID buf_id, return vaStatus; } -VAStatus sunxi_cedrus_UnmapBuffer(VADriverContextP ctx, VABufferID buf_id) +VAStatus SunxiCedrusUnmapBuffer(VADriverContextP ctx, VABufferID buf_id) { struct sunxi_cedrus_driver_data *driver_data = (struct sunxi_cedrus_driver_data *) ctx->pDriverData; @@ -188,7 +188,7 @@ void sunxi_cedrus_destroy_buffer(struct sunxi_cedrus_driver_data *driver_data, object_heap_free(&driver_data->buffer_heap, obj_buffer); } -VAStatus sunxi_cedrus_DestroyBuffer(VADriverContextP ctx, VABufferID buffer_id) +VAStatus SunxiCedrusDestroyBuffer(VADriverContextP ctx, VABufferID buffer_id) { struct sunxi_cedrus_driver_data *driver_data = (struct sunxi_cedrus_driver_data *) ctx->pDriverData; @@ -201,7 +201,7 @@ VAStatus sunxi_cedrus_DestroyBuffer(VADriverContextP ctx, VABufferID buffer_id) } /* sunxi-cedrus doesn't support buffer info */ -VAStatus sunxi_cedrus_BufferInfo(VADriverContextP ctx, VABufferID buf_id, +VAStatus SunxiCedrusBufferInfo(VADriverContextP ctx, VABufferID buf_id, VABufferType *type, unsigned int *size, unsigned int *num_elements) { return VA_STATUS_ERROR_UNIMPLEMENTED; } diff --git a/src/buffer.h b/src/buffer.h index 99d60db..416b51d 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -45,24 +45,24 @@ struct object_buffer { unsigned int map_size; }; -VAStatus sunxi_cedrus_CreateBuffer(VADriverContextP ctx, VAContextID context, +VAStatus SunxiCedrusCreateBuffer(VADriverContextP ctx, VAContextID context, VABufferType type, unsigned int size, unsigned int num_elements, void *data, VABufferID *buf_id); -VAStatus sunxi_cedrus_BufferSetNumElements(VADriverContextP ctx, +VAStatus SunxiCedrusBufferSetNumElements(VADriverContextP ctx, VABufferID buf_id, unsigned int num_elements); -VAStatus sunxi_cedrus_MapBuffer(VADriverContextP ctx, VABufferID buf_id, +VAStatus SunxiCedrusMapBuffer(VADriverContextP ctx, VABufferID buf_id, void **pbuf); -VAStatus sunxi_cedrus_UnmapBuffer(VADriverContextP ctx, VABufferID buf_id); +VAStatus SunxiCedrusUnmapBuffer(VADriverContextP ctx, VABufferID buf_id); void sunxi_cedrus_destroy_buffer(struct sunxi_cedrus_driver_data *driver_data, struct object_buffer *obj_buffer); -VAStatus sunxi_cedrus_DestroyBuffer(VADriverContextP ctx, VABufferID buffer_id); +VAStatus SunxiCedrusDestroyBuffer(VADriverContextP ctx, VABufferID buffer_id); -VAStatus sunxi_cedrus_BufferInfo(VADriverContextP ctx, VABufferID buf_id, +VAStatus SunxiCedrusBufferInfo(VADriverContextP ctx, VABufferID buf_id, VABufferType *type, unsigned int *size, unsigned int *num_elements); diff --git a/src/context.c b/src/context.c index 802d026..1fdeb58 100644 --- a/src/context.c +++ b/src/context.c @@ -44,7 +44,7 @@ * format is set. */ -VAStatus sunxi_cedrus_CreateContext(VADriverContextP ctx, VAConfigID config_id, +VAStatus SunxiCedrusCreateContext(VADriverContextP ctx, VAConfigID config_id, int picture_width, int picture_height, int flag, VASurfaceID *render_targets, int num_render_targets, VAContextID *context) @@ -152,7 +152,7 @@ VAStatus sunxi_cedrus_CreateContext(VADriverContextP ctx, VAConfigID config_id, return vaStatus; } -VAStatus sunxi_cedrus_DestroyContext(VADriverContextP ctx, VAContextID context) +VAStatus SunxiCedrusDestroyContext(VADriverContextP ctx, VAContextID context) { struct sunxi_cedrus_driver_data *driver_data = (struct sunxi_cedrus_driver_data *) ctx->pDriverData; diff --git a/src/context.h b/src/context.h index 065ec2a..f24006a 100644 --- a/src/context.h +++ b/src/context.h @@ -55,11 +55,11 @@ struct object_context { struct v4l2_ctrl_mpeg4_frame_hdr mpeg4_frame_hdr; }; -VAStatus sunxi_cedrus_CreateContext(VADriverContextP ctx, VAConfigID config_id, +VAStatus SunxiCedrusCreateContext(VADriverContextP ctx, VAConfigID config_id, int picture_width, int picture_height, int flag, VASurfaceID *render_targets, int num_render_targets, VAContextID *context); -VAStatus sunxi_cedrus_DestroyContext(VADriverContextP ctx, VAContextID context); +VAStatus SunxiCedrusDestroyContext(VADriverContextP ctx, VAContextID context); #endif /* _CONTEXT_H_ */ diff --git a/src/image.c b/src/image.c index b7b501a..af42d2f 100644 --- a/src/image.c +++ b/src/image.c @@ -39,7 +39,7 @@ * Surface. */ -VAStatus sunxi_cedrus_QueryImageFormats(VADriverContextP ctx, +VAStatus SunxiCedrusQueryImageFormats(VADriverContextP ctx, VAImageFormat *format_list, int *num_formats) { format_list[0].fourcc = VA_FOURCC_NV12; @@ -47,7 +47,7 @@ VAStatus sunxi_cedrus_QueryImageFormats(VADriverContextP ctx, return VA_STATUS_SUCCESS; } -VAStatus sunxi_cedrus_CreateImage(VADriverContextP ctx, VAImageFormat *format, +VAStatus SunxiCedrusCreateImage(VADriverContextP ctx, VAImageFormat *format, int width, int height, VAImage *image) { struct sunxi_cedrus_driver_data *driver_data = @@ -78,7 +78,7 @@ VAStatus sunxi_cedrus_CreateImage(VADriverContextP ctx, VAImageFormat *format, obj_img = IMAGE(image->image_id); - if (sunxi_cedrus_CreateBuffer(ctx, 0, VAImageBufferType, image->data_size, + if (SunxiCedrusCreateBuffer(ctx, 0, VAImageBufferType, image->data_size, 1, NULL, &image->buf) != VA_STATUS_SUCCESS) { // TODO: free image object return VA_STATUS_ERROR_ALLOCATION_FAILED; @@ -88,7 +88,7 @@ VAStatus sunxi_cedrus_CreateImage(VADriverContextP ctx, VAImageFormat *format, return VA_STATUS_SUCCESS; } -VAStatus sunxi_cedrus_DeriveImage(VADriverContextP ctx, VASurfaceID surface, +VAStatus SunxiCedrusDeriveImage(VADriverContextP ctx, VASurfaceID surface, VAImage *image) { struct sunxi_cedrus_driver_data *driver_data = @@ -102,9 +102,9 @@ VAStatus sunxi_cedrus_DeriveImage(VADriverContextP ctx, VASurfaceID surface, fmt.fourcc = VA_FOURCC_NV12; if (obj_surface->status == VASurfaceRendering) - sunxi_cedrus_SyncSurface(ctx, surface); + SunxiCedrusSyncSurface(ctx, surface); - ret = sunxi_cedrus_CreateImage(ctx, &fmt, obj_surface->width, obj_surface->height, image); + ret = SunxiCedrusCreateImage(ctx, &fmt, obj_surface->width, obj_surface->height, image); if(ret != VA_STATUS_SUCCESS) return ret; @@ -119,7 +119,7 @@ VAStatus sunxi_cedrus_DeriveImage(VADriverContextP ctx, VASurfaceID surface, return VA_STATUS_SUCCESS; } -VAStatus sunxi_cedrus_DestroyImage(VADriverContextP ctx, VAImageID image) +VAStatus SunxiCedrusDestroyImage(VADriverContextP ctx, VAImageID image) { struct sunxi_cedrus_driver_data *driver_data = (struct sunxi_cedrus_driver_data *) ctx->pDriverData; @@ -128,22 +128,22 @@ VAStatus sunxi_cedrus_DestroyImage(VADriverContextP ctx, VAImageID image) obj_img = IMAGE(image); assert(obj_img); - sunxi_cedrus_DestroyBuffer(ctx, obj_img->buf); + SunxiCedrusDestroyBuffer(ctx, obj_img->buf); object_heap_free(&driver_data->image_heap, &obj_img->base); return VA_STATUS_SUCCESS; } -VAStatus sunxi_cedrus_SetImagePalette(VADriverContextP ctx, VAImageID image, +VAStatus SunxiCedrusSetImagePalette(VADriverContextP ctx, VAImageID image, unsigned char *palette) { return VA_STATUS_SUCCESS; } -VAStatus sunxi_cedrus_GetImage(VADriverContextP ctx, VASurfaceID surface, +VAStatus SunxiCedrusGetImage(VADriverContextP ctx, VASurfaceID surface, int x, int y, unsigned int width, unsigned int height, VAImageID image) { return VA_STATUS_SUCCESS; } -VAStatus sunxi_cedrus_PutImage(VADriverContextP ctx, VASurfaceID surface, +VAStatus SunxiCedrusPutImage(VADriverContextP ctx, VASurfaceID surface, VAImageID image, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y, unsigned int dest_width, unsigned int dest_height) diff --git a/src/image.h b/src/image.h index 9341f9e..a077053 100644 --- a/src/image.h +++ b/src/image.h @@ -38,25 +38,25 @@ struct object_image { VABufferID buf; }; -VAStatus sunxi_cedrus_QueryImageFormats(VADriverContextP ctx, +VAStatus SunxiCedrusQueryImageFormats(VADriverContextP ctx, VAImageFormat *format_list, int *num_formats); -VAStatus sunxi_cedrus_CreateImage(VADriverContextP ctx, VAImageFormat *format, +VAStatus SunxiCedrusCreateImage(VADriverContextP ctx, VAImageFormat *format, int width, int height, VAImage *image); -VAStatus sunxi_cedrus_DeriveImage(VADriverContextP ctx, VASurfaceID surface, +VAStatus SunxiCedrusDeriveImage(VADriverContextP ctx, VASurfaceID surface, VAImage *image); -VAStatus sunxi_cedrus_DestroyImage(VADriverContextP ctx, VAImageID image); +VAStatus SunxiCedrusDestroyImage(VADriverContextP ctx, VAImageID image); -VAStatus sunxi_cedrus_SetImagePalette(VADriverContextP ctx, VAImageID image, +VAStatus SunxiCedrusSetImagePalette(VADriverContextP ctx, VAImageID image, unsigned char *palette); -VAStatus sunxi_cedrus_GetImage(VADriverContextP ctx, VASurfaceID surface, +VAStatus SunxiCedrusGetImage(VADriverContextP ctx, VASurfaceID surface, int x, int y, unsigned int width, unsigned int height, VAImageID image); -VAStatus sunxi_cedrus_PutImage(VADriverContextP ctx, VASurfaceID surface, +VAStatus SunxiCedrusPutImage(VADriverContextP ctx, VASurfaceID surface, VAImageID image, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y, unsigned int dest_width, unsigned int dest_height); diff --git a/src/picture.c b/src/picture.c index 0d27f9b..d49231e 100644 --- a/src/picture.c +++ b/src/picture.c @@ -50,7 +50,7 @@ * kernel space when reaching EndPicture. */ -VAStatus sunxi_cedrus_BeginPicture(VADriverContextP ctx, VAContextID context, +VAStatus SunxiCedrusBeginPicture(VADriverContextP ctx, VAContextID context, VASurfaceID render_target) { struct sunxi_cedrus_driver_data *driver_data = @@ -66,7 +66,7 @@ VAStatus sunxi_cedrus_BeginPicture(VADriverContextP ctx, VAContextID context, assert(obj_surface); if (obj_surface->status == VASurfaceRendering) { - vaStatus = sunxi_cedrus_SyncSurface(ctx, render_target); + vaStatus = SunxiCedrusSyncSurface(ctx, render_target); if (vaStatus != VA_STATUS_SUCCESS) return vaStatus; } @@ -81,7 +81,7 @@ VAStatus sunxi_cedrus_BeginPicture(VADriverContextP ctx, VAContextID context, return vaStatus; } -VAStatus sunxi_cedrus_RenderPicture(VADriverContextP ctx, VAContextID context, +VAStatus SunxiCedrusRenderPicture(VADriverContextP ctx, VAContextID context, VABufferID *buffers, int num_buffers) { struct sunxi_cedrus_driver_data *driver_data = @@ -142,7 +142,7 @@ VAStatus sunxi_cedrus_RenderPicture(VADriverContextP ctx, VAContextID context, return vaStatus; } -VAStatus sunxi_cedrus_EndPicture(VADriverContextP ctx, VAContextID context) +VAStatus SunxiCedrusEndPicture(VADriverContextP ctx, VAContextID context) { struct sunxi_cedrus_driver_data *driver_data = (struct sunxi_cedrus_driver_data *) ctx->pDriverData; diff --git a/src/picture.h b/src/picture.h index f864321..1b224ae 100644 --- a/src/picture.h +++ b/src/picture.h @@ -30,12 +30,12 @@ #include "object_heap.h" -VAStatus sunxi_cedrus_BeginPicture(VADriverContextP ctx, VAContextID context, +VAStatus SunxiCedrusBeginPicture(VADriverContextP ctx, VAContextID context, VASurfaceID render_target); -VAStatus sunxi_cedrus_RenderPicture(VADriverContextP ctx, VAContextID context, +VAStatus SunxiCedrusRenderPicture(VADriverContextP ctx, VAContextID context, VABufferID *buffers, int num_buffers); -VAStatus sunxi_cedrus_EndPicture(VADriverContextP ctx, VAContextID context); +VAStatus SunxiCedrusEndPicture(VADriverContextP ctx, VAContextID context); #endif /* _PICTURE_H_ */ diff --git a/src/subpicture.c b/src/subpicture.c index 865c576..b57363b 100644 --- a/src/subpicture.c +++ b/src/subpicture.c @@ -30,37 +30,37 @@ * Subpictures aren't supported yet */ -VAStatus sunxi_cedrus_QuerySubpictureFormats(VADriverContextP ctx, +VAStatus SunxiCedrusQuerySubpictureFormats(VADriverContextP ctx, VAImageFormat *format_list, unsigned int *flags, unsigned int *num_formats) { return VA_STATUS_SUCCESS; } -VAStatus sunxi_cedrus_CreateSubpicture(VADriverContextP ctx, VAImageID image, +VAStatus SunxiCedrusCreateSubpicture(VADriverContextP ctx, VAImageID image, VASubpictureID *subpicture) { return VA_STATUS_SUCCESS; } -VAStatus sunxi_cedrus_DestroySubpicture(VADriverContextP ctx, +VAStatus SunxiCedrusDestroySubpicture(VADriverContextP ctx, VASubpictureID subpicture) { return VA_STATUS_SUCCESS; } -VAStatus sunxi_cedrus_SetSubpictureImage(VADriverContextP ctx, +VAStatus SunxiCedrusSetSubpictureImage(VADriverContextP ctx, VASubpictureID subpicture, VAImageID image) { return VA_STATUS_SUCCESS; } -VAStatus sunxi_cedrus_SetSubpicturePalette(VADriverContextP ctx, +VAStatus SunxiCedrusSetSubpicturePalette(VADriverContextP ctx, VASubpictureID subpicture, unsigned char *palette) { return VA_STATUS_SUCCESS; } -VAStatus sunxi_cedrus_SetSubpictureChromakey(VADriverContextP ctx, +VAStatus SunxiCedrusSetSubpictureChromakey(VADriverContextP ctx, VASubpictureID subpicture, unsigned int chromakey_min, unsigned int chromakey_max, unsigned int chromakey_mask) { return VA_STATUS_SUCCESS; } -VAStatus sunxi_cedrus_SetSubpictureGlobalAlpha(VADriverContextP ctx, +VAStatus SunxiCedrusSetSubpictureGlobalAlpha(VADriverContextP ctx, VASubpictureID subpicture, float global_alpha) { return VA_STATUS_SUCCESS; } -VAStatus sunxi_cedrus_AssociateSubpicture(VADriverContextP ctx, +VAStatus SunxiCedrusAssociateSubpicture(VADriverContextP ctx, VASubpictureID subpicture, VASurfaceID *target_surfaces, int num_surfaces, short src_x, short src_y, unsigned short src_width, unsigned short src_height, @@ -68,7 +68,7 @@ VAStatus sunxi_cedrus_AssociateSubpicture(VADriverContextP ctx, unsigned short dest_height, unsigned int flags) { return VA_STATUS_SUCCESS; } -VAStatus sunxi_cedrus_DeassociateSubpicture(VADriverContextP ctx, +VAStatus SunxiCedrusDeassociateSubpicture(VADriverContextP ctx, VASubpictureID subpicture, VASurfaceID *target_surfaces, int num_surfaces) { return VA_STATUS_SUCCESS; } diff --git a/src/subpicture.h b/src/subpicture.h index 1e60266..9917e78 100644 --- a/src/subpicture.h +++ b/src/subpicture.h @@ -28,37 +28,37 @@ #include -VAStatus sunxi_cedrus_QuerySubpictureFormats(VADriverContextP ctx, +VAStatus SunxiCedrusQuerySubpictureFormats(VADriverContextP ctx, VAImageFormat *format_list, unsigned int *flags, unsigned int *num_formats); -VAStatus sunxi_cedrus_CreateSubpicture(VADriverContextP ctx, VAImageID image, +VAStatus SunxiCedrusCreateSubpicture(VADriverContextP ctx, VAImageID image, VASubpictureID *subpicture); -VAStatus sunxi_cedrus_DestroySubpicture(VADriverContextP ctx, +VAStatus SunxiCedrusDestroySubpicture(VADriverContextP ctx, VASubpictureID subpicture); -VAStatus sunxi_cedrus_SetSubpictureImage(VADriverContextP ctx, +VAStatus SunxiCedrusSetSubpictureImage(VADriverContextP ctx, VASubpictureID subpicture, VAImageID image); -VAStatus sunxi_cedrus_SetSubpicturePalette(VADriverContextP ctx, +VAStatus SunxiCedrusSetSubpicturePalette(VADriverContextP ctx, VASubpictureID subpicture, unsigned char *palette); -VAStatus sunxi_cedrus_SetSubpictureChromakey(VADriverContextP ctx, +VAStatus SunxiCedrusSetSubpictureChromakey(VADriverContextP ctx, VASubpictureID subpicture, unsigned int chromakey_min, unsigned int chromakey_max, unsigned int chromakey_mask); -VAStatus sunxi_cedrus_SetSubpictureGlobalAlpha(VADriverContextP ctx, +VAStatus SunxiCedrusSetSubpictureGlobalAlpha(VADriverContextP ctx, VASubpictureID subpicture, float global_alpha); -VAStatus sunxi_cedrus_AssociateSubpicture(VADriverContextP ctx, +VAStatus SunxiCedrusAssociateSubpicture(VADriverContextP ctx, VASubpictureID subpicture, VASurfaceID *target_surfaces, int num_surfaces, short src_x, short src_y, unsigned short src_width, unsigned short src_height, short dest_x, short dest_y, unsigned short dest_width, unsigned short dest_height, unsigned int flags); -VAStatus sunxi_cedrus_DeassociateSubpicture(VADriverContextP ctx, +VAStatus SunxiCedrusDeassociateSubpicture(VADriverContextP ctx, VASubpictureID subpicture, VASurfaceID *target_surfaces, int num_surfaces); diff --git a/src/sunxi_cedrus.c b/src/sunxi_cedrus.c index 08c1716..d116572 100644 --- a/src/sunxi_cedrus.c +++ b/src/sunxi_cedrus.c @@ -61,7 +61,7 @@ void sunxi_cedrus_msg(const char *msg, ...) } /* Free memory and close v4l device */ -VAStatus sunxi_cedrus_Terminate(VADriverContextP ctx) +VAStatus SunxiCedrusTerminate(VADriverContextP ctx) { struct sunxi_cedrus_driver_data *driver_data = (struct sunxi_cedrus_driver_data *) ctx->pDriverData; @@ -125,50 +125,50 @@ VAStatus VA_DRIVER_INIT_FUNC(VADriverContextP ctx) ctx->max_display_attributes = SUNXI_CEDRUS_MAX_DISPLAY_ATTRIBUTES; ctx->str_vendor = SUNXI_CEDRUS_STR_VENDOR; - vtable->vaTerminate = sunxi_cedrus_Terminate; - vtable->vaQueryConfigEntrypoints = sunxi_cedrus_QueryConfigEntrypoints; - vtable->vaQueryConfigProfiles = sunxi_cedrus_QueryConfigProfiles; - vtable->vaQueryConfigEntrypoints = sunxi_cedrus_QueryConfigEntrypoints; - vtable->vaQueryConfigAttributes = sunxi_cedrus_QueryConfigAttributes; - vtable->vaCreateConfig = sunxi_cedrus_CreateConfig; - vtable->vaDestroyConfig = sunxi_cedrus_DestroyConfig; - vtable->vaGetConfigAttributes = sunxi_cedrus_GetConfigAttributes; - vtable->vaCreateSurfaces = sunxi_cedrus_CreateSurfaces; - vtable->vaDestroySurfaces = sunxi_cedrus_DestroySurfaces; - vtable->vaCreateContext = sunxi_cedrus_CreateContext; - vtable->vaDestroyContext = sunxi_cedrus_DestroyContext; - vtable->vaCreateBuffer = sunxi_cedrus_CreateBuffer; - vtable->vaBufferSetNumElements = sunxi_cedrus_BufferSetNumElements; - vtable->vaMapBuffer = sunxi_cedrus_MapBuffer; - vtable->vaUnmapBuffer = sunxi_cedrus_UnmapBuffer; - vtable->vaDestroyBuffer = sunxi_cedrus_DestroyBuffer; - vtable->vaBeginPicture = sunxi_cedrus_BeginPicture; - vtable->vaRenderPicture = sunxi_cedrus_RenderPicture; - vtable->vaEndPicture = sunxi_cedrus_EndPicture; - vtable->vaSyncSurface = sunxi_cedrus_SyncSurface; - vtable->vaQuerySurfaceStatus = sunxi_cedrus_QuerySurfaceStatus; - vtable->vaPutSurface = sunxi_cedrus_PutSurface; - vtable->vaQueryImageFormats = sunxi_cedrus_QueryImageFormats; - vtable->vaCreateImage = sunxi_cedrus_CreateImage; - vtable->vaDeriveImage = sunxi_cedrus_DeriveImage; - vtable->vaDestroyImage = sunxi_cedrus_DestroyImage; - vtable->vaSetImagePalette = sunxi_cedrus_SetImagePalette; - vtable->vaGetImage = sunxi_cedrus_GetImage; - vtable->vaPutImage = sunxi_cedrus_PutImage; - vtable->vaQuerySubpictureFormats = sunxi_cedrus_QuerySubpictureFormats; - vtable->vaCreateSubpicture = sunxi_cedrus_CreateSubpicture; - vtable->vaDestroySubpicture = sunxi_cedrus_DestroySubpicture; - vtable->vaSetSubpictureImage = sunxi_cedrus_SetSubpictureImage; - vtable->vaSetSubpictureChromakey = sunxi_cedrus_SetSubpictureChromakey; - vtable->vaSetSubpictureGlobalAlpha = sunxi_cedrus_SetSubpictureGlobalAlpha; - vtable->vaAssociateSubpicture = sunxi_cedrus_AssociateSubpicture; - vtable->vaDeassociateSubpicture = sunxi_cedrus_DeassociateSubpicture; - vtable->vaQueryDisplayAttributes = sunxi_cedrus_QueryDisplayAttributes; - vtable->vaGetDisplayAttributes = sunxi_cedrus_GetDisplayAttributes; - vtable->vaSetDisplayAttributes = sunxi_cedrus_SetDisplayAttributes; - vtable->vaLockSurface = sunxi_cedrus_LockSurface; - vtable->vaUnlockSurface = sunxi_cedrus_UnlockSurface; - vtable->vaBufferInfo = sunxi_cedrus_BufferInfo; + vtable->vaTerminate = SunxiCedrusTerminate; + vtable->vaQueryConfigEntrypoints = SunxiCedrusQueryConfigEntrypoints; + vtable->vaQueryConfigProfiles = SunxiCedrusQueryConfigProfiles; + vtable->vaQueryConfigEntrypoints = SunxiCedrusQueryConfigEntrypoints; + vtable->vaQueryConfigAttributes = SunxiCedrusQueryConfigAttributes; + vtable->vaCreateConfig = SunxiCedrusCreateConfig; + vtable->vaDestroyConfig = SunxiCedrusDestroyConfig; + vtable->vaGetConfigAttributes = SunxiCedrusGetConfigAttributes; + vtable->vaCreateSurfaces = SunxiCedrusCreateSurfaces; + vtable->vaDestroySurfaces = SunxiCedrusDestroySurfaces; + vtable->vaCreateContext = SunxiCedrusCreateContext; + vtable->vaDestroyContext = SunxiCedrusDestroyContext; + vtable->vaCreateBuffer = SunxiCedrusCreateBuffer; + vtable->vaBufferSetNumElements = SunxiCedrusBufferSetNumElements; + vtable->vaMapBuffer = SunxiCedrusMapBuffer; + vtable->vaUnmapBuffer = SunxiCedrusUnmapBuffer; + vtable->vaDestroyBuffer = SunxiCedrusDestroyBuffer; + vtable->vaBeginPicture = SunxiCedrusBeginPicture; + vtable->vaRenderPicture = SunxiCedrusRenderPicture; + vtable->vaEndPicture = SunxiCedrusEndPicture; + vtable->vaSyncSurface = SunxiCedrusSyncSurface; + vtable->vaQuerySurfaceStatus = SunxiCedrusQuerySurfaceStatus; + vtable->vaPutSurface = SunxiCedrusPutSurface; + vtable->vaQueryImageFormats = SunxiCedrusQueryImageFormats; + vtable->vaCreateImage = SunxiCedrusCreateImage; + vtable->vaDeriveImage = SunxiCedrusDeriveImage; + vtable->vaDestroyImage = SunxiCedrusDestroyImage; + vtable->vaSetImagePalette = SunxiCedrusSetImagePalette; + vtable->vaGetImage = SunxiCedrusGetImage; + vtable->vaPutImage = SunxiCedrusPutImage; + vtable->vaQuerySubpictureFormats = SunxiCedrusQuerySubpictureFormats; + vtable->vaCreateSubpicture = SunxiCedrusCreateSubpicture; + vtable->vaDestroySubpicture = SunxiCedrusDestroySubpicture; + vtable->vaSetSubpictureImage = SunxiCedrusSetSubpictureImage; + vtable->vaSetSubpictureChromakey = SunxiCedrusSetSubpictureChromakey; + vtable->vaSetSubpictureGlobalAlpha = SunxiCedrusSetSubpictureGlobalAlpha; + vtable->vaAssociateSubpicture = SunxiCedrusAssociateSubpicture; + vtable->vaDeassociateSubpicture = SunxiCedrusDeassociateSubpicture; + vtable->vaQueryDisplayAttributes = SunxiCedrusQueryDisplayAttributes; + vtable->vaGetDisplayAttributes = SunxiCedrusGetDisplayAttributes; + vtable->vaSetDisplayAttributes = SunxiCedrusSetDisplayAttributes; + vtable->vaLockSurface = SunxiCedrusLockSurface; + vtable->vaUnlockSurface = SunxiCedrusUnlockSurface; + vtable->vaBufferInfo = SunxiCedrusBufferInfo; driver_data = (struct sunxi_cedrus_driver_data *) malloc(sizeof(*driver_data)); diff --git a/src/surface.c b/src/surface.c index 503c38a..163477f 100644 --- a/src/surface.c +++ b/src/surface.c @@ -52,7 +52,7 @@ * purpose. */ -VAStatus sunxi_cedrus_CreateSurfaces(VADriverContextP ctx, int width, +VAStatus SunxiCedrusCreateSurfaces(VADriverContextP ctx, int width, int height, int format, int num_surfaces, VASurfaceID *surfaces) { struct sunxi_cedrus_driver_data *driver_data = @@ -142,7 +142,7 @@ VAStatus sunxi_cedrus_CreateSurfaces(VADriverContextP ctx, int width, return vaStatus; } -VAStatus sunxi_cedrus_DestroySurfaces(VADriverContextP ctx, +VAStatus SunxiCedrusDestroySurfaces(VADriverContextP ctx, VASurfaceID *surface_list, int num_surfaces) { struct sunxi_cedrus_driver_data *driver_data = @@ -157,7 +157,7 @@ VAStatus sunxi_cedrus_DestroySurfaces(VADriverContextP ctx, return VA_STATUS_SUCCESS; } -VAStatus sunxi_cedrus_SyncSurface(VADriverContextP ctx, +VAStatus SunxiCedrusSyncSurface(VADriverContextP ctx, VASurfaceID render_target) { struct sunxi_cedrus_driver_data *driver_data = @@ -225,7 +225,7 @@ VAStatus sunxi_cedrus_SyncSurface(VADriverContextP ctx, return VA_STATUS_SUCCESS; } -VAStatus sunxi_cedrus_QuerySurfaceStatus(VADriverContextP ctx, +VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP ctx, VASurfaceID render_target, VASurfaceStatus *status) { struct sunxi_cedrus_driver_data *driver_data = @@ -242,7 +242,7 @@ VAStatus sunxi_cedrus_QuerySurfaceStatus(VADriverContextP ctx, } /* WARNING: This is for development purpose only!!! */ -VAStatus sunxi_cedrus_PutSurface(VADriverContextP ctx, VASurfaceID surface, +VAStatus SunxiCedrusPutSurface(VADriverContextP ctx, VASurfaceID surface, void *draw, short srcx, short srcy, unsigned short srcw, unsigned short srch, short destx, short desty, unsigned short destw, unsigned short desth, @@ -293,7 +293,7 @@ VAStatus sunxi_cedrus_PutSurface(VADriverContextP ctx, VASurfaceID surface, return VA_STATUS_SUCCESS; } -VAStatus sunxi_cedrus_LockSurface(VADriverContextP ctx, VASurfaceID surface, +VAStatus SunxiCedrusLockSurface(VADriverContextP ctx, VASurfaceID surface, unsigned int *fourcc, unsigned int *luma_stride, unsigned int *chroma_u_stride, unsigned int *chroma_v_stride, unsigned int *luma_offset, unsigned int *chroma_u_offset, @@ -301,5 +301,5 @@ VAStatus sunxi_cedrus_LockSurface(VADriverContextP ctx, VASurfaceID surface, void **buffer) { return VA_STATUS_ERROR_UNIMPLEMENTED; } -VAStatus sunxi_cedrus_UnlockSurface(VADriverContextP ctx, VASurfaceID surface) +VAStatus SunxiCedrusUnlockSurface(VADriverContextP ctx, VASurfaceID surface) { return VA_STATUS_ERROR_UNIMPLEMENTED; } diff --git a/src/surface.h b/src/surface.h index 0eb0654..e1aa114 100644 --- a/src/surface.h +++ b/src/surface.h @@ -44,32 +44,32 @@ struct object_surface { VAStatus status; }; -VAStatus sunxi_cedrus_CreateSurfaces(VADriverContextP ctx, int width, +VAStatus SunxiCedrusCreateSurfaces(VADriverContextP ctx, int width, int height, int format, int num_surfaces, VASurfaceID *surfaces); -VAStatus sunxi_cedrus_DestroySurfaces(VADriverContextP ctx, +VAStatus SunxiCedrusDestroySurfaces(VADriverContextP ctx, VASurfaceID *surface_list, int num_surfaces); -VAStatus sunxi_cedrus_SyncSurface(VADriverContextP ctx, +VAStatus SunxiCedrusSyncSurface(VADriverContextP ctx, VASurfaceID render_target); -VAStatus sunxi_cedrus_QuerySurfaceStatus(VADriverContextP ctx, +VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP ctx, VASurfaceID render_target, VASurfaceStatus *status); -VAStatus sunxi_cedrus_PutSurface(VADriverContextP ctx, VASurfaceID surface, +VAStatus SunxiCedrusPutSurface(VADriverContextP ctx, VASurfaceID surface, void *draw, short srcx, short srcy, unsigned short srcw, unsigned short srch, short destx, short desty, unsigned short destw, unsigned short desth, VARectangle *cliprects, unsigned int number_cliprects, unsigned int flags); -VAStatus sunxi_cedrus_LockSurface(VADriverContextP ctx, VASurfaceID surface, +VAStatus SunxiCedrusLockSurface(VADriverContextP ctx, VASurfaceID surface, unsigned int *fourcc, unsigned int *luma_stride, unsigned int *chroma_u_stride, unsigned int *chroma_v_stride, unsigned int *luma_offset, unsigned int *chroma_u_offset, unsigned int *chroma_v_offset, unsigned int *buffer_name, void **buffer); -VAStatus sunxi_cedrus_UnlockSurface(VADriverContextP ctx, VASurfaceID surface); +VAStatus SunxiCedrusUnlockSurface(VADriverContextP ctx, VASurfaceID surface); #endif /* _SURFACES_H_ */ diff --git a/src/va_config.c b/src/va_config.c index 2147f30..dc7ff99 100644 --- a/src/va_config.c +++ b/src/va_config.c @@ -39,7 +39,7 @@ * correspondence between v4l and VA video formats. */ -VAStatus sunxi_cedrus_QueryConfigProfiles(VADriverContextP ctx, +VAStatus SunxiCedrusQueryConfigProfiles(VADriverContextP ctx, VAProfile *profile_list, int *num_profiles) { struct sunxi_cedrus_driver_data *driver_data = @@ -72,7 +72,7 @@ VAStatus sunxi_cedrus_QueryConfigProfiles(VADriverContextP ctx, return VA_STATUS_SUCCESS; } -VAStatus sunxi_cedrus_QueryConfigEntrypoints(VADriverContextP ctx, +VAStatus SunxiCedrusQueryConfigEntrypoints(VADriverContextP ctx, VAProfile profile, VAEntrypoint *entrypoint_list, int *num_entrypoints) { @@ -100,7 +100,7 @@ VAStatus sunxi_cedrus_QueryConfigEntrypoints(VADriverContextP ctx, return VA_STATUS_SUCCESS; } -VAStatus sunxi_cedrus_GetConfigAttributes(VADriverContextP ctx, +VAStatus SunxiCedrusGetConfigAttributes(VADriverContextP ctx, VAProfile profile, VAEntrypoint entrypoint, VAConfigAttrib *attrib_list, int num_attribs) { @@ -124,7 +124,7 @@ VAStatus sunxi_cedrus_GetConfigAttributes(VADriverContextP ctx, return VA_STATUS_SUCCESS; } -VAStatus sunxi_cedrus_update_attribute(struct object_config *obj_config, +VAStatus SunxiCedrusupdate_attribute(struct object_config *obj_config, VAConfigAttrib *attrib) { int i; @@ -149,7 +149,7 @@ VAStatus sunxi_cedrus_update_attribute(struct object_config *obj_config, return VA_STATUS_ERROR_MAX_NUM_EXCEEDED; } -VAStatus sunxi_cedrus_CreateConfig(VADriverContextP ctx, VAProfile profile, +VAStatus SunxiCedrusCreateConfig(VADriverContextP ctx, VAProfile profile, VAEntrypoint entrypoint, VAConfigAttrib *attrib_list, int num_attribs, VAConfigID *config_id) { @@ -218,7 +218,7 @@ VAStatus sunxi_cedrus_CreateConfig(VADriverContextP ctx, VAProfile profile, return vaStatus; } -VAStatus sunxi_cedrus_DestroyConfig(VADriverContextP ctx, VAConfigID config_id) +VAStatus SunxiCedrusDestroyConfig(VADriverContextP ctx, VAConfigID config_id) { struct sunxi_cedrus_driver_data *driver_data = (struct sunxi_cedrus_driver_data *) ctx->pDriverData; @@ -236,7 +236,7 @@ VAStatus sunxi_cedrus_DestroyConfig(VADriverContextP ctx, VAConfigID config_id) return VA_STATUS_SUCCESS; } -VAStatus sunxi_cedrus_QueryConfigAttributes(VADriverContextP ctx, +VAStatus SunxiCedrusQueryConfigAttributes(VADriverContextP ctx, VAConfigID config_id, VAProfile *profile, VAEntrypoint *entrypoint, VAConfigAttrib *attrib_list, int *num_attribs) @@ -260,14 +260,14 @@ VAStatus sunxi_cedrus_QueryConfigAttributes(VADriverContextP ctx, } /* sunxi-cedrus doesn't support display attributes */ -VAStatus sunxi_cedrus_QueryDisplayAttributes (VADriverContextP ctx, +VAStatus SunxiCedrusQueryDisplayAttributes (VADriverContextP ctx, VADisplayAttribute *attr_list, int *num_attributes) { return VA_STATUS_ERROR_UNKNOWN; } -VAStatus sunxi_cedrus_GetDisplayAttributes (VADriverContextP ctx, +VAStatus SunxiCedrusGetDisplayAttributes (VADriverContextP ctx, VADisplayAttribute *attr_list, int num_attributes) { return VA_STATUS_ERROR_UNKNOWN; } -VAStatus sunxi_cedrus_SetDisplayAttributes (VADriverContextP ctx, +VAStatus SunxiCedrusSetDisplayAttributes (VADriverContextP ctx, VADisplayAttribute *attr_list, int num_attributes) { return VA_STATUS_ERROR_UNKNOWN; } diff --git a/src/va_config.h b/src/va_config.h index c1c0fbc..4820e63 100644 --- a/src/va_config.h +++ b/src/va_config.h @@ -41,38 +41,38 @@ struct object_config { int attrib_count; }; -VAStatus sunxi_cedrus_QueryConfigProfiles(VADriverContextP ctx, +VAStatus SunxiCedrusQueryConfigProfiles(VADriverContextP ctx, VAProfile *profile_list, int *num_profiles); -VAStatus sunxi_cedrus_QueryConfigEntrypoints(VADriverContextP ctx, +VAStatus SunxiCedrusQueryConfigEntrypoints(VADriverContextP ctx, VAProfile profile, VAEntrypoint *entrypoint_list, int *num_entrypoints); -VAStatus sunxi_cedrus_GetConfigAttributes(VADriverContextP ctx, +VAStatus SunxiCedrusGetConfigAttributes(VADriverContextP ctx, VAProfile profile, VAEntrypoint entrypoint, VAConfigAttrib *attrib_list, int num_attribs); -VAStatus sunxi_cedrus_update_attribute(struct object_config *obj_config, +VAStatus SunxiCedrusupdate_attribute(struct object_config *obj_config, VAConfigAttrib *attrib); -VAStatus sunxi_cedrus_CreateConfig(VADriverContextP ctx, VAProfile profile, +VAStatus SunxiCedrusCreateConfig(VADriverContextP ctx, VAProfile profile, VAEntrypoint entrypoint, VAConfigAttrib *attrib_list, int num_attribs, VAConfigID *config_id); -VAStatus sunxi_cedrus_DestroyConfig(VADriverContextP ctx, VAConfigID config_id); +VAStatus SunxiCedrusDestroyConfig(VADriverContextP ctx, VAConfigID config_id); -VAStatus sunxi_cedrus_QueryConfigAttributes(VADriverContextP ctx, +VAStatus SunxiCedrusQueryConfigAttributes(VADriverContextP ctx, VAConfigID config_id, VAProfile *profile, VAEntrypoint *entrypoint, VAConfigAttrib *attrib_list, int *num_attribs); -VAStatus sunxi_cedrus_QueryDisplayAttributes (VADriverContextP ctx, +VAStatus SunxiCedrusQueryDisplayAttributes (VADriverContextP ctx, VADisplayAttribute *attr_list, int *num_attributes); -VAStatus sunxi_cedrus_GetDisplayAttributes (VADriverContextP ctx, +VAStatus SunxiCedrusGetDisplayAttributes (VADriverContextP ctx, VADisplayAttribute *attr_list, int num_attributes); -VAStatus sunxi_cedrus_SetDisplayAttributes (VADriverContextP ctx, +VAStatus SunxiCedrusSetDisplayAttributes (VADriverContextP ctx, VADisplayAttribute *attr_list, int num_attributes); #endif /* _CONFIG_H_ */