From 621b26b781a0d7feda0595436c6583b5b9b20d19 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Mon, 23 Apr 2018 13:35:18 +0200 Subject: [PATCH] surface: Rename functions arguments for more clarity Signed-off-by: Paul Kocialkowski --- src/surface.c | 66 +++++++++++++++++++++++++-------------------------- src/surface.h | 49 +++++++++++++++++--------------------- 2 files changed, 55 insertions(+), 60 deletions(-) diff --git a/src/surface.c b/src/surface.c index 163477f..07b78bc 100644 --- a/src/surface.c +++ b/src/surface.c @@ -52,11 +52,11 @@ * purpose. */ -VAStatus SunxiCedrusCreateSurfaces(VADriverContextP ctx, int width, - int height, int format, int num_surfaces, VASurfaceID *surfaces) +VAStatus SunxiCedrusCreateSurfaces(VADriverContextP context, int width, + int height, int format, int surfaces_count, VASurfaceID *surfaces) { struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) ctx->pDriverData; + (struct sunxi_cedrus_driver_data *) context->pDriverData; VAStatus vaStatus = VA_STATUS_SUCCESS; int i; struct v4l2_buffer buf; @@ -81,7 +81,7 @@ VAStatus SunxiCedrusCreateSurfaces(VADriverContextP ctx, int width, assert(ioctl(driver_data->mem2mem_fd, VIDIOC_S_FMT, &fmt)==0); memset (&create_bufs, 0, sizeof (struct v4l2_create_buffers)); - create_bufs.count = num_surfaces; + create_bufs.count = surfaces_count; create_bufs.memory = V4L2_MEMORY_MMAP; create_bufs.format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; assert(ioctl(driver_data->mem2mem_fd, VIDIOC_G_FMT, &create_bufs.format)==0); @@ -142,26 +142,26 @@ VAStatus SunxiCedrusCreateSurfaces(VADriverContextP ctx, int width, return vaStatus; } -VAStatus SunxiCedrusDestroySurfaces(VADriverContextP ctx, - VASurfaceID *surface_list, int num_surfaces) +VAStatus SunxiCedrusDestroySurfaces(VADriverContextP context, + VASurfaceID *surfaces_ids, int surfaces_count) { struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) ctx->pDriverData; + (struct sunxi_cedrus_driver_data *) context->pDriverData; int i; - for(i = num_surfaces; i--;) + for(i = surfaces_count; i--;) { - struct object_surface *obj_surface = SURFACE(surface_list[i]); + struct object_surface *obj_surface = SURFACE(surfaces_ids[i]); assert(obj_surface); object_heap_free(&driver_data->surface_heap, (object_base_p) obj_surface); } return VA_STATUS_SUCCESS; } -VAStatus SunxiCedrusSyncSurface(VADriverContextP ctx, - VASurfaceID render_target) +VAStatus SunxiCedrusSyncSurface(VADriverContextP context, + VASurfaceID surface_id) { struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) ctx->pDriverData; + (struct sunxi_cedrus_driver_data *) context->pDriverData; struct object_surface *obj_surface; struct v4l2_buffer buf; struct v4l2_plane plane[1]; @@ -173,7 +173,7 @@ VAStatus SunxiCedrusSyncSurface(VADriverContextP ctx, memset(plane, 0, sizeof(struct v4l2_plane)); memset(planes, 0, 2 * sizeof(struct v4l2_plane)); - obj_surface = SURFACE(render_target); + obj_surface = SURFACE(surface_id); assert(obj_surface); if(obj_surface->status == VASurfaceSkipped) @@ -225,15 +225,15 @@ VAStatus SunxiCedrusSyncSurface(VADriverContextP ctx, return VA_STATUS_SUCCESS; } -VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP ctx, - VASurfaceID render_target, VASurfaceStatus *status) +VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP context, + VASurfaceID surface_id, VASurfaceStatus *status) { struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) ctx->pDriverData; + (struct sunxi_cedrus_driver_data *) context->pDriverData; VAStatus vaStatus = VA_STATUS_SUCCESS; struct object_surface *obj_surface; - obj_surface = SURFACE(render_target); + obj_surface = SURFACE(surface_id); assert(obj_surface); *status = obj_surface->status; @@ -242,15 +242,15 @@ VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP ctx, } /* WARNING: This is for development purpose only!!! */ -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 SunxiCedrusPutSurface(VADriverContextP context, VASurfaceID surface_id, + void *draw, short src_x, short src_y, unsigned short src_width, + unsigned short src_height, short dst_x, short dst_y, + unsigned short dst_width, unsigned short dst_height, + VARectangle *cliprects, unsigned int cliprects_count, + unsigned int flags) { struct sunxi_cedrus_driver_data *driver_data = - (struct sunxi_cedrus_driver_data *) ctx->pDriverData; + (struct sunxi_cedrus_driver_data *) context->pDriverData; GC gc; Display *display; const XID xid = (XID)(uintptr_t)draw; @@ -278,8 +278,8 @@ VAStatus SunxiCedrusPutSurface(VADriverContextP ctx, VASurfaceID surface, cm = DefaultColormap(display, screen); xcolor.flags = DoRed | DoGreen | DoBlue; - for(x=destx; x < destx+destw; x++) { - for(y=desty; y < desty+desth; y++) { + for(x=dst_x; x < dst_x+dst_w; x++) { + for(y=dst_y; y < dst_y+dst_h; y++) { char lum = driver_data->luma_bufs[obj_surface->output_buf_index][x+srcw*y]; xcolor.red = xcolor.green = xcolor.blue = lum*colorratio; XAllocColor(display, cm, &xcolor); @@ -293,13 +293,13 @@ VAStatus SunxiCedrusPutSurface(VADriverContextP ctx, VASurfaceID surface, return VA_STATUS_SUCCESS; } -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 SunxiCedrusLockSurface(VADriverContextP context, + VASurfaceID surface_id, 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) { return VA_STATUS_ERROR_UNIMPLEMENTED; } -VAStatus SunxiCedrusUnlockSurface(VADriverContextP ctx, VASurfaceID surface) +VAStatus SunxiCedrusUnlockSurface(VADriverContextP context, + VASurfaceID surface_id) { return VA_STATUS_ERROR_UNIMPLEMENTED; } diff --git a/src/surface.h b/src/surface.h index 76e7a2b..9c0c9c6 100644 --- a/src/surface.h +++ b/src/surface.h @@ -46,32 +46,27 @@ struct object_surface { uint32_t output_buf_index; }; -VAStatus SunxiCedrusCreateSurfaces(VADriverContextP ctx, int width, - int height, int format, int num_surfaces, VASurfaceID *surfaces); - -VAStatus SunxiCedrusDestroySurfaces(VADriverContextP ctx, - VASurfaceID *surface_list, int num_surfaces); - -VAStatus SunxiCedrusSyncSurface(VADriverContextP ctx, - VASurfaceID render_target); - -VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP ctx, - VASurfaceID render_target, VASurfaceStatus *status); - -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 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 SunxiCedrusUnlockSurface(VADriverContextP ctx, VASurfaceID surface); +VAStatus SunxiCedrusCreateSurfaces(VADriverContextP context, int width, + int height, int format, int surfaces_count, VASurfaceID *surfaces); +VAStatus SunxiCedrusDestroySurfaces(VADriverContextP context, + VASurfaceID *surfaces_ids, int surfaces_count); +VAStatus SunxiCedrusSyncSurface(VADriverContextP context, + VASurfaceID surface_id); +VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP context, + VASurfaceID surface_id, VASurfaceStatus *status); +VAStatus SunxiCedrusPutSurface(VADriverContextP context, VASurfaceID surface_id, + void *draw, short src_x, short src_y, unsigned short src_width, + unsigned short src_height, short dst_x, short dst_y, + unsigned short dst_width, unsigned short dst_height, + VARectangle *cliprects, unsigned int cliprects_count, + unsigned int flags); +VAStatus SunxiCedrusLockSurface(VADriverContextP context, + VASurfaceID surface_id, 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 SunxiCedrusUnlockSurface(VADriverContextP context, + VASurfaceID surface_id); #endif /* _SURFACES_H_ */