marfrit/libva-v4l2-request-fourier
1
0
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

surface: Rename functions arguments for more clarity

Browse Source 
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
This commit is contained in:
Paul Kocialkowski
2018-04-23 13:35:18 +02:00
parent 2ef39048c2
commit 621b26b781
2 changed files with 55 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/surface.c
+33 -33
View File
@@ -52,11 +52,11 @@
* purpose. * purpose.
*/ */
VAStatus SunxiCedrusCreateSurfaces(VADriverContextP ctx, int width, VAStatus SunxiCedrusCreateSurfaces(VADriverContextP context, int width,
int height, int format, int num_surfaces, VASurfaceID *surfaces) int height, int format, int surfaces_count, VASurfaceID *surfaces)
{ {
struct sunxi_cedrus_driver_data *driver_data = 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; VAStatus vaStatus = VA_STATUS_SUCCESS;
int i; int i;
struct v4l2_buffer buf; 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); assert(ioctl(driver_data->mem2mem_fd, VIDIOC_S_FMT, &fmt)==0);
memset (&create_bufs, 0, sizeof (struct v4l2_create_buffers)); 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.memory = V4L2_MEMORY_MMAP;
create_bufs.format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; create_bufs.format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
assert(ioctl(driver_data->mem2mem_fd, VIDIOC_G_FMT, &create_bufs.format)==0); 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; return vaStatus;
} }
VAStatus SunxiCedrusDestroySurfaces(VADriverContextP ctx, VAStatus SunxiCedrusDestroySurfaces(VADriverContextP context,
VASurfaceID *surface_list, int num_surfaces) VASurfaceID *surfaces_ids, int surfaces_count)
{ {
struct sunxi_cedrus_driver_data *driver_data = struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData; (struct sunxi_cedrus_driver_data *) context->pDriverData;
int i; 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); assert(obj_surface);
object_heap_free(&driver_data->surface_heap, (object_base_p) obj_surface); object_heap_free(&driver_data->surface_heap, (object_base_p) obj_surface);
} }
return VA_STATUS_SUCCESS; return VA_STATUS_SUCCESS;
} }
VAStatus SunxiCedrusSyncSurface(VADriverContextP ctx, VAStatus SunxiCedrusSyncSurface(VADriverContextP context,
VASurfaceID render_target) VASurfaceID surface_id)
{ {
struct sunxi_cedrus_driver_data *driver_data = 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 object_surface *obj_surface;
struct v4l2_buffer buf; struct v4l2_buffer buf;
struct v4l2_plane plane[1]; struct v4l2_plane plane[1];
@@ -173,7 +173,7 @@ VAStatus SunxiCedrusSyncSurface(VADriverContextP ctx,
memset(plane, 0, sizeof(struct v4l2_plane)); memset(plane, 0, sizeof(struct v4l2_plane));
memset(planes, 0, 2 * 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); assert(obj_surface);
if(obj_surface->status == VASurfaceSkipped) if(obj_surface->status == VASurfaceSkipped)
@@ -225,15 +225,15 @@ VAStatus SunxiCedrusSyncSurface(VADriverContextP ctx,
return VA_STATUS_SUCCESS; return VA_STATUS_SUCCESS;
} }
VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP ctx, VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP context,
VASurfaceID render_target, VASurfaceStatus *status) VASurfaceID surface_id, VASurfaceStatus *status)
{ {
struct sunxi_cedrus_driver_data *driver_data = 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; VAStatus vaStatus = VA_STATUS_SUCCESS;
struct object_surface *obj_surface; struct object_surface *obj_surface;
obj_surface = SURFACE(render_target); obj_surface = SURFACE(surface_id);
assert(obj_surface); assert(obj_surface);
*status = obj_surface->status; *status = obj_surface->status;
@@ -242,15 +242,15 @@ VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP ctx,
} }
/* WARNING: This is for development purpose only!!! */ /* WARNING: This is for development purpose only!!! */
VAStatus SunxiCedrusPutSurface(VADriverContextP ctx, VASurfaceID surface, VAStatus SunxiCedrusPutSurface(VADriverContextP context, VASurfaceID surface_id,
void *draw, short srcx, short srcy, unsigned short srcw, void *draw, short src_x, short src_y, unsigned short src_width,
unsigned short srch, short destx, short desty, unsigned short src_height, short dst_x, short dst_y,
unsigned short destw, unsigned short desth, unsigned short dst_width, unsigned short dst_height,
VARectangle *cliprects, unsigned int number_cliprects, VARectangle *cliprects, unsigned int cliprects_count,
unsigned int flags) unsigned int flags)
{ {
struct sunxi_cedrus_driver_data *driver_data = struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData; (struct sunxi_cedrus_driver_data *) context->pDriverData;
GC gc; GC gc;
Display *display; Display *display;
const XID xid = (XID)(uintptr_t)draw; const XID xid = (XID)(uintptr_t)draw;
@@ -278,8 +278,8 @@ VAStatus SunxiCedrusPutSurface(VADriverContextP ctx, VASurfaceID surface,
cm = DefaultColormap(display, screen); cm = DefaultColormap(display, screen);
xcolor.flags = DoRed | DoGreen | DoBlue; xcolor.flags = DoRed | DoGreen | DoBlue;
for(x=destx; x < destx+destw; x++) { for(x=dst_x; x < dst_x+dst_w; x++) {
for(y=desty; y < desty+desth; y++) { for(y=dst_y; y < dst_y+dst_h; y++) {
char lum = driver_data->luma_bufs[obj_surface->output_buf_index][x+srcw*y]; char lum = driver_data->luma_bufs[obj_surface->output_buf_index][x+srcw*y];
xcolor.red = xcolor.green = xcolor.blue = lum*colorratio; xcolor.red = xcolor.green = xcolor.blue = lum*colorratio;
XAllocColor(display, cm, &xcolor); XAllocColor(display, cm, &xcolor);
@@ -293,13 +293,13 @@ VAStatus SunxiCedrusPutSurface(VADriverContextP ctx, VASurfaceID surface,
return VA_STATUS_SUCCESS; return VA_STATUS_SUCCESS;
} }
VAStatus SunxiCedrusLockSurface(VADriverContextP ctx, VASurfaceID surface, VAStatus SunxiCedrusLockSurface(VADriverContextP context,
unsigned int *fourcc, unsigned int *luma_stride, VASurfaceID surface_id, unsigned int *fourcc, unsigned int *luma_stride,
unsigned int *chroma_u_stride, unsigned int *chroma_v_stride, unsigned int *chroma_u_stride, unsigned int *chroma_v_stride,
unsigned int *luma_offset, unsigned int *chroma_u_offset, unsigned int *luma_offset, unsigned int *chroma_u_offset,
unsigned int *chroma_v_offset, unsigned int *buffer_name, unsigned int *chroma_v_offset, unsigned int *buffer_name, void **buffer)
void **buffer)
{ return VA_STATUS_ERROR_UNIMPLEMENTED; } { return VA_STATUS_ERROR_UNIMPLEMENTED; }
VAStatus SunxiCedrusUnlockSurface(VADriverContextP ctx, VASurfaceID surface) VAStatus SunxiCedrusUnlockSurface(VADriverContextP context,
VASurfaceID surface_id)
{ return VA_STATUS_ERROR_UNIMPLEMENTED; } { return VA_STATUS_ERROR_UNIMPLEMENTED; }
src/surface.h
+22 -27
View File
@@ -46,32 +46,27 @@ struct object_surface {
uint32_t output_buf_index; uint32_t output_buf_index;
}; };
VAStatus SunxiCedrusCreateSurfaces(VADriverContextP ctx, int width, VAStatus SunxiCedrusCreateSurfaces(VADriverContextP context, int width,
int height, int format, int num_surfaces, VASurfaceID *surfaces); int height, int format, int surfaces_count, VASurfaceID *surfaces);
VAStatus SunxiCedrusDestroySurfaces(VADriverContextP context,
VAStatus SunxiCedrusDestroySurfaces(VADriverContextP ctx, VASurfaceID *surfaces_ids, int surfaces_count);
VASurfaceID *surface_list, int num_surfaces); VAStatus SunxiCedrusSyncSurface(VADriverContextP context,
VASurfaceID surface_id);
VAStatus SunxiCedrusSyncSurface(VADriverContextP ctx, VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP context,
VASurfaceID render_target); VASurfaceID surface_id, VASurfaceStatus *status);
VAStatus SunxiCedrusPutSurface(VADriverContextP context, VASurfaceID surface_id,
VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP ctx, void *draw, short src_x, short src_y, unsigned short src_width,
VASurfaceID render_target, VASurfaceStatus *status); unsigned short src_height, short dst_x, short dst_y,
unsigned short dst_width, unsigned short dst_height,
VAStatus SunxiCedrusPutSurface(VADriverContextP ctx, VASurfaceID surface, VARectangle *cliprects, unsigned int cliprects_count,
void *draw, short srcx, short srcy, unsigned short srcw, unsigned int flags);
unsigned short srch, short destx, short desty, VAStatus SunxiCedrusLockSurface(VADriverContextP context,
unsigned short destw, unsigned short desth, VASurfaceID surface_id, unsigned int *fourcc, unsigned int *luma_stride,
VARectangle *cliprects, unsigned int number_cliprects, unsigned int *chroma_u_stride, unsigned int *chroma_v_stride,
unsigned int flags); unsigned int *luma_offset, unsigned int *chroma_u_offset,
unsigned int *chroma_v_offset, unsigned int *buffer_name,
VAStatus SunxiCedrusLockSurface(VADriverContextP ctx, VASurfaceID surface, void **buffer);
unsigned int *fourcc, unsigned int *luma_stride, VAStatus SunxiCedrusUnlockSurface(VADriverContextP context,
unsigned int *chroma_u_stride, unsigned int *chroma_v_stride, VASurfaceID surface_id);
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);
#endif /* _SURFACES_H_ */ #endif /* _SURFACES_H_ */