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

tree: Rename the libva hooks

Browse Source 
As part of our renaming effort, Rename the libva hooks names to mention
request instead of SunxiCedrus

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
This commit is contained in:
Maxime Ripard
2018-07-17 16:06:11 +02:00
parent d43854dfd9
commit 913e1e642c
16 changed files with 323 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/buffer.c
+10 -12
View File
@@ -39,10 +39,10 @@
#include "utils.h"
#include "v4l2.h"
VAStatus SunxiCedrusCreateBuffer(VADriverContextP context,
VAContextID context_id, VABufferType type,
unsigned int size, unsigned int count,
void *data, VABufferID *buffer_id)
VAStatus RequestCreateBuffer(VADriverContextP context, VAContextID context_id,
VABufferType type, unsigned int size,
unsigned int count, void *data,
VABufferID *buffer_id)
{
struct cedrus_data *driver_data =
(struct cedrus_data *)context->pDriverData;
@@ -100,8 +100,7 @@ complete:
return status;
}
VAStatus SunxiCedrusDestroyBuffer(VADriverContextP context,
VABufferID buffer_id)
VAStatus RequestDestroyBuffer(VADriverContextP context, VABufferID buffer_id)
{
struct cedrus_data *driver_data =
(struct cedrus_data *)context->pDriverData;
@@ -120,7 +119,7 @@ VAStatus SunxiCedrusDestroyBuffer(VADriverContextP context,
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusMapBuffer(VADriverContextP context, VABufferID buffer_id,
VAStatus RequestMapBuffer(VADriverContextP context, VABufferID buffer_id,
void **data_map)
{
struct cedrus_data *driver_data =
@@ -137,7 +136,7 @@ VAStatus SunxiCedrusMapBuffer(VADriverContextP context, VABufferID buffer_id,
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusUnmapBuffer(VADriverContextP context, VABufferID buffer_id)
VAStatus RequestUnmapBuffer(VADriverContextP context, VABufferID buffer_id)
{
struct cedrus_data *driver_data =
(struct cedrus_data *)context->pDriverData;
@@ -152,9 +151,8 @@ VAStatus SunxiCedrusUnmapBuffer(VADriverContextP context, VABufferID buffer_id)
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusBufferSetNumElements(VADriverContextP context,
VABufferID buffer_id,
unsigned int count)
VAStatus RequestBufferSetNumElements(VADriverContextP context,
VABufferID buffer_id, unsigned int count)
{
struct cedrus_data *driver_data =
(struct cedrus_data *)context->pDriverData;
@@ -172,7 +170,7 @@ VAStatus SunxiCedrusBufferSetNumElements(VADriverContextP context,
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusBufferInfo(VADriverContextP context, VABufferID buffer_id,
VAStatus RequestBufferInfo(VADriverContextP context, VABufferID buffer_id,
VABufferType *type, unsigned int *size,
unsigned int *count)
{
src/buffer.h
+10 -12
View File
@@ -46,21 +46,19 @@ struct object_buffer {
unsigned int size;
};
VAStatus SunxiCedrusCreateBuffer(VADriverContextP context,
VAContextID context_id, VABufferType type,
unsigned int size, unsigned int count,
void *data, VABufferID *buffer_id);
VAStatus RequestCreateBuffer(VADriverContextP context, VAContextID context_id,
VABufferType type, unsigned int size,
unsigned int count, void *data,
VABufferID *buffer_id);
void sunxi_cedrus_destroy_buffer(struct cedrus_data *driver_data,
struct object_buffer *obj_buffer);
VAStatus SunxiCedrusDestroyBuffer(VADriverContextP context,
VABufferID buffer_id);
VAStatus SunxiCedrusMapBuffer(VADriverContextP context, VABufferID buffer_id,
VAStatus RequestDestroyBuffer(VADriverContextP context, VABufferID buffer_id);
VAStatus RequestMapBuffer(VADriverContextP context, VABufferID buffer_id,
void **data_map);
VAStatus SunxiCedrusUnmapBuffer(VADriverContextP context, VABufferID buffer_id);
VAStatus SunxiCedrusBufferSetNumElements(VADriverContextP context,
VABufferID buffer_id,
unsigned int count);
VAStatus SunxiCedrusBufferInfo(VADriverContextP context, VABufferID buffer_id,
VAStatus RequestUnmapBuffer(VADriverContextP context, VABufferID buffer_id);
VAStatus RequestBufferSetNumElements(VADriverContextP context,
VABufferID buffer_id, unsigned int count);
VAStatus RequestBufferInfo(VADriverContextP context, VABufferID buffer_id,
VABufferType *type, unsigned int *size,
unsigned int *count);
src/config.c
+13 -17
View File
@@ -36,10 +36,10 @@
#include "utils.h"
#include "v4l2.h"
VAStatus SunxiCedrusCreateConfig(VADriverContextP context, VAProfile profile,
VAStatus RequestCreateConfig(VADriverContextP context, VAProfile profile,
VAEntrypoint entrypoint,
VAConfigAttrib *attributes,
int attributes_count, VAConfigID *config_id)
VAConfigAttrib *attributes, int attributes_count,
VAConfigID *config_id)
{
struct cedrus_data *driver_data =
(struct cedrus_data *)context->pDriverData;
@@ -89,8 +89,7 @@ VAStatus SunxiCedrusCreateConfig(VADriverContextP context, VAProfile profile,
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusDestroyConfig(VADriverContextP context,
VAConfigID config_id)
VAStatus RequestDestroyConfig(VADriverContextP context, VAConfigID config_id)
{
struct cedrus_data *driver_data =
(struct cedrus_data *)context->pDriverData;
@@ -106,9 +105,8 @@ VAStatus SunxiCedrusDestroyConfig(VADriverContextP context,
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusQueryConfigProfiles(VADriverContextP context,
VAProfile *profiles,
int *profiles_count)
VAStatus RequestQueryConfigProfiles(VADriverContextP context,
VAProfile *profiles, int *profiles_count)
{
struct cedrus_data *driver_data =
(struct cedrus_data *)context->pDriverData;
@@ -139,7 +137,7 @@ VAStatus SunxiCedrusQueryConfigProfiles(VADriverContextP context,
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusQueryConfigEntrypoints(VADriverContextP context,
VAStatus RequestQueryConfigEntrypoints(VADriverContextP context,
VAProfile profile,
VAEntrypoint *entrypoints,
int *entrypoints_count)
@@ -164,9 +162,8 @@ VAStatus SunxiCedrusQueryConfigEntrypoints(VADriverContextP context,
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusQueryConfigAttributes(VADriverContextP context,
VAConfigID config_id,
VAProfile *profile,
VAStatus RequestQueryConfigAttributes(VADriverContextP context,
VAConfigID config_id, VAProfile *profile,
VAEntrypoint *entrypoint,
VAConfigAttrib *attributes,
int *attributes_count)
@@ -197,8 +194,7 @@ VAStatus SunxiCedrusQueryConfigAttributes(VADriverContextP context,
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusGetConfigAttributes(VADriverContextP context,
VAProfile profile,
VAStatus RequestGetConfigAttributes(VADriverContextP context, VAProfile profile,
VAEntrypoint entrypoint,
VAConfigAttrib *attributes,
int attributes_count)
@@ -219,21 +215,21 @@ VAStatus SunxiCedrusGetConfigAttributes(VADriverContextP context,
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusQueryDisplayAttributes(VADriverContextP context,
VAStatus RequestQueryDisplayAttributes(VADriverContextP context,
VADisplayAttribute *attributes,
int *attributes_count)
{
return VA_STATUS_ERROR_UNIMPLEMENTED;
}
VAStatus SunxiCedrusGetDisplayAttributes(VADriverContextP context,
VAStatus RequestGetDisplayAttributes(VADriverContextP context,
VADisplayAttribute *attributes,
int attributes_count)
{
return VA_STATUS_ERROR_UNIMPLEMENTED;
}
VAStatus SunxiCedrusSetDisplayAttributes(VADriverContextP context,
VAStatus RequestSetDisplayAttributes(VADriverContextP context,
VADisplayAttribute *attributes,
int attributes_count)
{
src/config.h
+13 -17
View File
@@ -44,37 +44,33 @@ struct object_config {
int attributes_count;
};
VAStatus SunxiCedrusCreateConfig(VADriverContextP context, VAProfile profile,
VAStatus RequestCreateConfig(VADriverContextP context, VAProfile profile,
VAEntrypoint entrypoint,
VAConfigAttrib *attributes,
int attributes_count, VAConfigID *config_id);
VAStatus SunxiCedrusDestroyConfig(VADriverContextP context,
VAConfigID config_id);
VAStatus SunxiCedrusQueryConfigProfiles(VADriverContextP context,
VAProfile *profiles,
int *profiles_count);
VAStatus SunxiCedrusQueryConfigEntrypoints(VADriverContextP context,
VAConfigAttrib *attributes, int attributes_count,
VAConfigID *config_id);
VAStatus RequestDestroyConfig(VADriverContextP context, VAConfigID config_id);
VAStatus RequestQueryConfigProfiles(VADriverContextP context,
VAProfile *profiles, int *profiles_count);
VAStatus RequestQueryConfigEntrypoints(VADriverContextP context,
VAProfile profile,
VAEntrypoint *entrypoints,
int *entrypoints_count);
VAStatus SunxiCedrusQueryConfigAttributes(VADriverContextP context,
VAConfigID config_id,
VAProfile *profile,
VAStatus RequestQueryConfigAttributes(VADriverContextP context,
VAConfigID config_id, VAProfile *profile,
VAEntrypoint *entrypoint,
VAConfigAttrib *attributes,
int *attributes_count);
VAStatus SunxiCedrusGetConfigAttributes(VADriverContextP context,
VAProfile profile,
VAStatus RequestGetConfigAttributes(VADriverContextP context, VAProfile profile,
VAEntrypoint entrypoint,
VAConfigAttrib *attributes,
int attributes_count);
VAStatus SunxiCedrusQueryDisplayAttributes(VADriverContextP context,
VAStatus RequestQueryDisplayAttributes(VADriverContextP context,
VADisplayAttribute *attributes,
int *attributes_count);
VAStatus SunxiCedrusGetDisplayAttributes(VADriverContextP context,
VAStatus RequestGetDisplayAttributes(VADriverContextP context,
VADisplayAttribute *attributes,
int attributes_count);
VAStatus SunxiCedrusSetDisplayAttributes(VADriverContextP context,
VAStatus RequestSetDisplayAttributes(VADriverContextP context,
VADisplayAttribute *attributes,
int attributes_count);
src/context.c
+3 -5
View File
@@ -41,9 +41,8 @@
#include "utils.h"
#include "v4l2.h"
VAStatus SunxiCedrusCreateContext(VADriverContextP context,
VAConfigID config_id, int picture_width,
int picture_height, int flags,
VAStatus RequestCreateContext(VADriverContextP context, VAConfigID config_id,
int picture_width, int picture_height, int flags,
VASurfaceID *surfaces_ids, int surfaces_count,
VAContextID *context_id)
{
@@ -194,8 +193,7 @@ complete:
return status;
}
VAStatus SunxiCedrusDestroyContext(VADriverContextP context,
VAContextID context_id)
VAStatus RequestDestroyContext(VADriverContextP context, VAContextID context_id)
{
struct cedrus_data *driver_data =
(struct cedrus_data *)context->pDriverData;
src/context.h
+3 -4
View File
@@ -51,12 +51,11 @@ struct object_context {
struct h264_dpb dpb;
};
VAStatus SunxiCedrusCreateContext(VADriverContextP context,
VAConfigID config_id, int picture_width,
int picture_height, int flags,
VAStatus RequestCreateContext(VADriverContextP context, VAConfigID config_id,
int picture_width, int picture_height, int flags,
VASurfaceID *surfaces_ids, int surfaces_count,
VAContextID *context_id);
VAStatus SunxiCedrusDestroyContext(VADriverContextP context,
VAStatus RequestDestroyContext(VADriverContextP context,
VAContextID context_id);
#endif
src/image.c
+16 -17
View File
@@ -35,7 +35,7 @@
#include "utils.h"
#include "v4l2.h"
VAStatus SunxiCedrusCreateImage(VADriverContextP context, VAImageFormat *format,
VAStatus RequestCreateImage(VADriverContextP context, VAImageFormat *format,
int width, int height, VAImage *image)
{
struct cedrus_data *driver_data =
@@ -68,7 +68,7 @@ VAStatus SunxiCedrusCreateImage(VADriverContextP context, VAImageFormat *format,
if (image_object == NULL)
return VA_STATUS_ERROR_ALLOCATION_FAILED;
status = SunxiCedrusCreateBuffer(context, 0, VAImageBufferType, size, 1,
status = RequestCreateBuffer(context, 0, VAImageBufferType, size, 1,
NULL, &buffer_id);
if (status != VA_STATUS_SUCCESS) {
object_heap_free(&driver_data->image_heap,
@@ -97,7 +97,7 @@ VAStatus SunxiCedrusCreateImage(VADriverContextP context, VAImageFormat *format,
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusDestroyImage(VADriverContextP context, VAImageID image_id)
VAStatus RequestDestroyImage(VADriverContextP context, VAImageID image_id)
{
struct cedrus_data *driver_data =
(struct cedrus_data *)context->pDriverData;
@@ -108,7 +108,7 @@ VAStatus SunxiCedrusDestroyImage(VADriverContextP context, VAImageID image_id)
if (image_object == NULL)
return VA_STATUS_ERROR_INVALID_IMAGE;
status = SunxiCedrusDestroyBuffer(context, image_object->buffer_id);
status = RequestDestroyBuffer(context, image_object->buffer_id);
if (status != VA_STATUS_SUCCESS)
return status;
@@ -118,8 +118,8 @@ VAStatus SunxiCedrusDestroyImage(VADriverContextP context, VAImageID image_id)
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusDeriveImage(VADriverContextP context,
VASurfaceID surface_id, VAImage *image)
VAStatus RequestDeriveImage(VADriverContextP context, VASurfaceID surface_id,
VAImage *image)
{
struct cedrus_data *driver_data =
(struct cedrus_data *)context->pDriverData;
@@ -134,7 +134,7 @@ VAStatus SunxiCedrusDeriveImage(VADriverContextP context,
return VA_STATUS_ERROR_INVALID_SURFACE;
if (surface_object->status == VASurfaceRendering) {
status = SunxiCedrusSyncSurface(context, surface_id);
status = RequestSyncSurface(context, surface_id);
if (status != VA_STATUS_SUCCESS)
return status;
} else if (surface_object->status == VASurfaceReady) {
@@ -143,7 +143,7 @@ VAStatus SunxiCedrusDeriveImage(VADriverContextP context,
format.fourcc = VA_FOURCC_NV12;
status = SunxiCedrusCreateImage(context, &format, surface_object->width,
status = RequestCreateImage(context, &format, surface_object->width,
surface_object->height, image);
if (status != VA_STATUS_SUCCESS)
return status;
@@ -170,9 +170,8 @@ VAStatus SunxiCedrusDeriveImage(VADriverContextP context,
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusQueryImageFormats(VADriverContextP context,
VAImageFormat *formats,
int *formats_count)
VAStatus RequestQueryImageFormats(VADriverContextP context,
VAImageFormat *formats, int *formats_count)
{
formats[0].fourcc = VA_FOURCC_NV12;
*formats_count = 1;
@@ -180,20 +179,20 @@ VAStatus SunxiCedrusQueryImageFormats(VADriverContextP context,
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusSetImagePalette(VADriverContextP context,
VAImageID image_id, unsigned char *palette)
VAStatus RequestSetImagePalette(VADriverContextP context, VAImageID image_id,
unsigned char *palette)
{
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusGetImage(VADriverContextP context, VASurfaceID surface_id,
int x, int y, unsigned int width,
unsigned int height, VAImageID image_id)
VAStatus RequestGetImage(VADriverContextP context, VASurfaceID surface_id,
int x, int y, unsigned int width, unsigned int height,
VAImageID image_id)
{
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusPutImage(VADriverContextP context, VASurfaceID surface_id,
VAStatus RequestPutImage(VADriverContextP context, VASurfaceID surface_id,
VAImageID image, int src_x, int src_y,
unsigned int src_width, unsigned int src_height,
int dst_x, int dst_y, unsigned int dst_width,
src/image.h
+12 -13
View File
@@ -40,20 +40,19 @@ struct object_image {
VABufferID buffer_id;
};
VAStatus SunxiCedrusCreateImage(VADriverContextP context, VAImageFormat *format,
VAStatus RequestCreateImage(VADriverContextP context, VAImageFormat *format,
int width, int height, VAImage *image);
VAStatus SunxiCedrusDestroyImage(VADriverContextP context, VAImageID image_id);
VAStatus SunxiCedrusDeriveImage(VADriverContextP context,
VASurfaceID surface_id, VAImage *image);
VAStatus SunxiCedrusQueryImageFormats(VADriverContextP context,
VAImageFormat *formats,
int *formats_count);
VAStatus SunxiCedrusSetImagePalette(VADriverContextP context,
VAImageID image_id, unsigned char *palette);
VAStatus SunxiCedrusGetImage(VADriverContextP context, VASurfaceID surface_id,
int x, int y, unsigned int width,
unsigned int height, VAImageID image_id);
VAStatus SunxiCedrusPutImage(VADriverContextP context, VASurfaceID surface_id,
VAStatus RequestDestroyImage(VADriverContextP context, VAImageID image_id);
VAStatus RequestDeriveImage(VADriverContextP context, VASurfaceID surface_id,
VAImage *image);
VAStatus RequestQueryImageFormats(VADriverContextP context,
VAImageFormat *formats, int *formats_count);
VAStatus RequestSetImagePalette(VADriverContextP context, VAImageID image_id,
unsigned char *palette);
VAStatus RequestGetImage(VADriverContextP context, VASurfaceID surface_id,
int x, int y, unsigned int width, unsigned int height,
VAImageID image_id);
VAStatus RequestPutImage(VADriverContextP context, VASurfaceID surface_id,
VAImageID image, int src_x, int src_y,
unsigned int src_width, unsigned int src_height,
int dst_x, int dst_y, unsigned int dst_width,
src/picture.c
+6 -8
View File
@@ -163,8 +163,8 @@ static VAStatus codec_set_controls(struct cedrus_data *driver_data,
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusBeginPicture(VADriverContextP context,
VAContextID context_id, VASurfaceID surface_id)
VAStatus RequestBeginPicture(VADriverContextP context, VAContextID context_id,
VASurfaceID surface_id)
{
struct cedrus_data *driver_data =
(struct cedrus_data *)context->pDriverData;
@@ -180,7 +180,7 @@ VAStatus SunxiCedrusBeginPicture(VADriverContextP context,
return VA_STATUS_ERROR_INVALID_SURFACE;
if (surface_object->status == VASurfaceRendering)
SunxiCedrusSyncSurface(context, surface_id);
RequestSyncSurface(context, surface_id);
surface_object->status = VASurfaceRendering;
context_object->render_surface_id = surface_id;
@@ -188,8 +188,7 @@ VAStatus SunxiCedrusBeginPicture(VADriverContextP context,
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusRenderPicture(VADriverContextP context,
VAContextID context_id,
VAStatus RequestRenderPicture(VADriverContextP context, VAContextID context_id,
VABufferID *buffers_ids, int buffers_count)
{
struct cedrus_data *driver_data =
@@ -228,7 +227,7 @@ VAStatus SunxiCedrusRenderPicture(VADriverContextP context,
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusEndPicture(VADriverContextP context, VAContextID context_id)
VAStatus RequestEndPicture(VADriverContextP context, VAContextID context_id)
{
struct cedrus_data *driver_data =
(struct cedrus_data *)context->pDriverData;
@@ -282,8 +281,7 @@ VAStatus SunxiCedrusEndPicture(VADriverContextP context, VAContextID context_id)
surface_object->slices_size = 0;
status = SunxiCedrusSyncSurface(context,
context_object->render_surface_id);
status = RequestSyncSurface(context, context_object->render_surface_id);
if (status != VA_STATUS_SUCCESS)
return status;
src/picture.h
+4 -7
View File
@@ -30,13 +30,10 @@
#include "object_heap.h"
VAStatus SunxiCedrusBeginPicture(VADriverContextP context,
VAContextID context_id,
VAStatus RequestBeginPicture(VADriverContextP context, VAContextID context_id,
VASurfaceID surface_id);
VAStatus SunxiCedrusRenderPicture(VADriverContextP context,
VAContextID context_id, VABufferID *buffers,
int buffers_count);
VAStatus SunxiCedrusEndPicture(VADriverContextP context,
VAContextID context_id);
VAStatus RequestRenderPicture(VADriverContextP context, VAContextID context_id,
VABufferID *buffers, int buffers_count);
VAStatus RequestEndPicture(VADriverContextP context, VAContextID context_id);
#endif
src/subpicture.c
+13 -19
View File
@@ -26,20 +26,19 @@
#include "subpicture.h"
#include "sunxi_cedrus.h"
VAStatus SunxiCedrusCreateSubpicture(VADriverContextP context,
VAImageID image_id,
VAStatus RequestCreateSubpicture(VADriverContextP context, VAImageID image_id,
VASubpictureID *subpicture_id)
{
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusDestroySubpicture(VADriverContextP context,
VAStatus RequestDestroySubpicture(VADriverContextP context,
VASubpictureID subpicture_id)
{
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusQuerySubpictureFormats(VADriverContextP context,
VAStatus RequestQuerySubpictureFormats(VADriverContextP context,
VAImageFormat *formats,
unsigned int *flags,
unsigned int *formats_count)
@@ -47,21 +46,21 @@ VAStatus SunxiCedrusQuerySubpictureFormats(VADriverContextP context,
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusSetSubpictureImage(VADriverContextP context,
VAStatus RequestSetSubpictureImage(VADriverContextP context,
VASubpictureID subpicture_id,
VAImageID image_id)
{
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusSetSubpicturePalette(VADriverContextP context,
VAStatus RequestSetSubpicturePalette(VADriverContextP context,
VASubpictureID subpicture_id,
unsigned char *palette)
{
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusSetSubpictureChromakey(VADriverContextP context,
VAStatus RequestSetSubpictureChromakey(VADriverContextP context,
VASubpictureID subpicture_id,
unsigned int chromakey_min,
unsigned int chromakey_max,
@@ -70,29 +69,24 @@ VAStatus SunxiCedrusSetSubpictureChromakey(VADriverContextP context,
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusSetSubpictureGlobalAlpha(VADriverContextP context,
VAStatus RequestSetSubpictureGlobalAlpha(VADriverContextP context,
VASubpictureID subpicture_id,
float global_alpha)
{
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusAssociateSubpicture(VADriverContextP context,
VASubpictureID subpicture_id,
VASurfaceID *surfaces_ids,
int surfaces_count,
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,
VAStatus RequestAssociateSubpicture(
VADriverContextP context, VASubpictureID subpicture_id,
VASurfaceID *surfaces_ids, int surfaces_count, 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,
unsigned int flags)
{
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusDeassociateSubpicture(VADriverContextP context,
VAStatus RequestDeassociateSubpicture(VADriverContextP context,
VASubpictureID subpicture_id,
VASurfaceID *surfaces_ids,
int surfaces_count)
src/subpicture.h
+9 -10
View File
@@ -28,30 +28,29 @@
#include <va/va_backend.h>
VAStatus SunxiCedrusCreateSubpicture(VADriverContextP context,
VAImageID image_id,
VAStatus RequestCreateSubpicture(VADriverContextP context, VAImageID image_id,
VASubpictureID *subpicture_id);
VAStatus SunxiCedrusDestroySubpicture(VADriverContextP context,
VAStatus RequestDestroySubpicture(VADriverContextP context,
VASubpictureID subpicture_id);
VAStatus SunxiCedrusQuerySubpictureFormats(VADriverContextP context,
VAStatus RequestQuerySubpictureFormats(VADriverContextP context,
VAImageFormat *formats,
unsigned int *flags,
unsigned int *formats_count);
VAStatus SunxiCedrusSetSubpictureImage(VADriverContextP context,
VAStatus RequestSetSubpictureImage(VADriverContextP context,
VASubpictureID subpicture_id,
VAImageID image_id);
VAStatus SunxiCedrusSetSubpicturePalette(VADriverContextP context,
VAStatus RequestSetSubpicturePalette(VADriverContextP context,
VASubpictureID subpicture_id,
unsigned char *palette);
VAStatus SunxiCedrusSetSubpictureChromakey(VADriverContextP context,
VAStatus RequestSetSubpictureChromakey(VADriverContextP context,
VASubpictureID subpicture_id,
unsigned int chromakey_min,
unsigned int chromakey_max,
unsigned int chromakey_mask);
VAStatus SunxiCedrusSetSubpictureGlobalAlpha(VADriverContextP context,
VAStatus RequestSetSubpictureGlobalAlpha(VADriverContextP context,
VASubpictureID subpicture_id,
float global_alpha);
VAStatus SunxiCedrusAssociateSubpicture(VADriverContextP context,
VAStatus RequestAssociateSubpicture(VADriverContextP context,
VASubpictureID subpicture_id,
VASurfaceID *surfaces_ids,
int surfaces_count,
@@ -62,7 +61,7 @@ VAStatus SunxiCedrusAssociateSubpicture(VADriverContextP context,
unsigned short dst_width,
unsigned short dst_height,
unsigned int flags);
VAStatus SunxiCedrusDeassociateSubpicture(VADriverContextP context,
VAStatus RequestDeassociateSubpicture(VADriverContextP context,
VASubpictureID subpicture_id,
VASurfaceID *surfaces_ids,
int surfaces_count);
src/sunxi_cedrus.c
+51 -54
View File
@@ -77,51 +77,50 @@ VAStatus VA_DRIVER_INIT_FUNC(VADriverContextP context)
context->max_display_attributes = SUNXI_CEDRUS_MAX_DISPLAY_ATTRIBUTES;
context->str_vendor = SUNXI_CEDRUS_STR_VENDOR;
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;
vtable->vaTerminate = RequestTerminate;
vtable->vaQueryConfigEntrypoints = RequestQueryConfigEntrypoints;
vtable->vaQueryConfigProfiles = RequestQueryConfigProfiles;
vtable->vaQueryConfigEntrypoints = RequestQueryConfigEntrypoints;
vtable->vaQueryConfigAttributes = RequestQueryConfigAttributes;
vtable->vaCreateConfig = RequestCreateConfig;
vtable->vaDestroyConfig = RequestDestroyConfig;
vtable->vaGetConfigAttributes = RequestGetConfigAttributes;
vtable->vaCreateSurfaces = RequestCreateSurfaces;
vtable->vaDestroySurfaces = RequestDestroySurfaces;
vtable->vaCreateContext = RequestCreateContext;
vtable->vaDestroyContext = RequestDestroyContext;
vtable->vaCreateBuffer = RequestCreateBuffer;
vtable->vaBufferSetNumElements = RequestBufferSetNumElements;
vtable->vaMapBuffer = RequestMapBuffer;
vtable->vaUnmapBuffer = RequestUnmapBuffer;
vtable->vaDestroyBuffer = RequestDestroyBuffer;
vtable->vaBeginPicture = RequestBeginPicture;
vtable->vaRenderPicture = RequestRenderPicture;
vtable->vaEndPicture = RequestEndPicture;
vtable->vaSyncSurface = RequestSyncSurface;
vtable->vaQuerySurfaceStatus = RequestQuerySurfaceStatus;
vtable->vaPutSurface = RequestPutSurface;
vtable->vaQueryImageFormats = RequestQueryImageFormats;
vtable->vaCreateImage = RequestCreateImage;
vtable->vaDeriveImage = RequestDeriveImage;
vtable->vaDestroyImage = RequestDestroyImage;
vtable->vaSetImagePalette = RequestSetImagePalette;
vtable->vaGetImage = RequestGetImage;
vtable->vaPutImage = RequestPutImage;
vtable->vaQuerySubpictureFormats = RequestQuerySubpictureFormats;
vtable->vaCreateSubpicture = RequestCreateSubpicture;
vtable->vaDestroySubpicture = RequestDestroySubpicture;
vtable->vaSetSubpictureImage = RequestSetSubpictureImage;
vtable->vaSetSubpictureChromakey = RequestSetSubpictureChromakey;
vtable->vaSetSubpictureGlobalAlpha = RequestSetSubpictureGlobalAlpha;
vtable->vaAssociateSubpicture = RequestAssociateSubpicture;
vtable->vaDeassociateSubpicture = RequestDeassociateSubpicture;
vtable->vaQueryDisplayAttributes = RequestQueryDisplayAttributes;
vtable->vaGetDisplayAttributes = RequestGetDisplayAttributes;
vtable->vaSetDisplayAttributes = RequestSetDisplayAttributes;
vtable->vaLockSurface = RequestLockSurface;
vtable->vaUnlockSurface = RequestUnlockSurface;
vtable->vaBufferInfo = RequestBufferInfo;
driver_data = malloc(sizeof(*driver_data));
memset(driver_data, 0, sizeof(*driver_data));
@@ -182,7 +181,7 @@ complete:
return status;
}
VAStatus SunxiCedrusTerminate(VADriverContextP context)
VAStatus RequestTerminate(VADriverContextP context)
{
struct cedrus_data *driver_data =
(struct cedrus_data *)context->pDriverData;
@@ -201,8 +200,7 @@ VAStatus SunxiCedrusTerminate(VADriverContextP context)
image_object = (struct object_image *)
object_heap_first(&driver_data->image_heap, &iterator);
while (image_object != NULL) {
SunxiCedrusDestroyImage(context,
(VAImageID)image_object->base.id);
RequestDestroyImage(context, (VAImageID)image_object->base.id);
image_object = (struct object_image *)
object_heap_next(&driver_data->image_heap, &iterator);
}
@@ -212,7 +210,7 @@ VAStatus SunxiCedrusTerminate(VADriverContextP context)
buffer_object = (struct object_buffer *)
object_heap_first(&driver_data->buffer_heap, &iterator);
while (buffer_object != NULL) {
SunxiCedrusDestroyBuffer(context,
RequestDestroyBuffer(context,
(VABufferID)buffer_object->base.id);
buffer_object = (struct object_buffer *)
object_heap_next(&driver_data->buffer_heap, &iterator);
@@ -223,9 +221,8 @@ VAStatus SunxiCedrusTerminate(VADriverContextP context)
surface_object = (struct object_surface *)
object_heap_first(&driver_data->surface_heap, &iterator);
while (surface_object != NULL) {
SunxiCedrusDestroySurfaces(context,
(VASurfaceID *)&surface_object->base.id,
1);
RequestDestroySurfaces(context,
(VASurfaceID *)&surface_object->base.id, 1);
surface_object = (struct object_surface *)
object_heap_next(&driver_data->surface_heap, &iterator);
}
@@ -235,7 +232,7 @@ VAStatus SunxiCedrusTerminate(VADriverContextP context)
context_object = (struct object_context *)
object_heap_first(&driver_data->context_heap, &iterator);
while (context_object != NULL) {
SunxiCedrusDestroyContext(context,
RequestDestroyContext(context,
(VAContextID)context_object->base.id);
context_object = (struct object_context *)
object_heap_next(&driver_data->context_heap, &iterator);
@@ -246,7 +243,7 @@ VAStatus SunxiCedrusTerminate(VADriverContextP context)
config_object = (struct object_config *)
object_heap_first(&driver_data->config_heap, &iterator);
while (config_object != NULL) {
SunxiCedrusDestroyConfig(context,
RequestDestroyConfig(context,
(VAConfigID)config_object->base.id);
config_object = (struct object_config *)
object_heap_next(&driver_data->config_heap, &iterator);
src/sunxi_cedrus.h
+1 -1
View File
@@ -56,6 +56,6 @@ struct cedrus_data {
};
VAStatus VA_DRIVER_INIT_FUNC(VADriverContextP context);
VAStatus SunxiCedrusTerminate(VADriverContextP context);
VAStatus RequestTerminate(VADriverContextP context);
#endif
src/surface.c
+13 -19
View File
@@ -42,8 +42,8 @@
#include "v4l2.h"
#include "video.h"
VAStatus SunxiCedrusCreateSurfaces(VADriverContextP context, int width,
int height, int format, int surfaces_count,
VAStatus RequestCreateSurfaces(VADriverContextP context, int width, int height,
int format, int surfaces_count,
VASurfaceID *surfaces_ids)
{
struct cedrus_data *driver_data =
@@ -172,9 +172,8 @@ VAStatus SunxiCedrusCreateSurfaces(VADriverContextP context, int width,
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusDestroySurfaces(VADriverContextP context,
VASurfaceID *surfaces_ids,
int surfaces_count)
VAStatus RequestDestroySurfaces(VADriverContextP context,
VASurfaceID *surfaces_ids, int surfaces_count)
{
struct cedrus_data *driver_data =
(struct cedrus_data *)context->pDriverData;
@@ -210,8 +209,7 @@ VAStatus SunxiCedrusDestroySurfaces(VADriverContextP context,
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusSyncSurface(VADriverContextP context,
VASurfaceID surface_id)
VAStatus RequestSyncSurface(VADriverContextP context, VASurfaceID surface_id)
{
struct cedrus_data *driver_data =
(struct cedrus_data *)context->pDriverData;
@@ -287,7 +285,7 @@ complete:
return status;
}
VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP context,
VAStatus RequestQuerySurfaceStatus(VADriverContextP context,
VASurfaceID surface_id,
VASurfaceStatus *status)
{
@@ -304,21 +302,18 @@ VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP context,
return VA_STATUS_SUCCESS;
}
VAStatus SunxiCedrusPutSurface(VADriverContextP context, VASurfaceID surface_id,
VAStatus RequestPutSurface(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 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)
{
return VA_STATUS_ERROR_UNIMPLEMENTED;
}
VAStatus SunxiCedrusLockSurface(VADriverContextP context,
VASurfaceID surface_id, unsigned int *fourcc,
unsigned int *luma_stride,
VAStatus RequestLockSurface(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,
@@ -329,8 +324,7 @@ VAStatus SunxiCedrusLockSurface(VADriverContextP context,
return VA_STATUS_ERROR_UNIMPLEMENTED;
}
VAStatus SunxiCedrusUnlockSurface(VADriverContextP context,
VASurfaceID surface_id)
VAStatus RequestUnlockSurface(VADriverContextP context, VASurfaceID surface_id)
{
return VA_STATUS_ERROR_UNIMPLEMENTED;
}
src/surface.h
+14 -21
View File
@@ -75,36 +75,29 @@ struct object_surface {
int request_fd;
};
VAStatus SunxiCedrusCreateSurfaces(VADriverContextP context, int width,
int height, int format, int surfaces_count,
VAStatus RequestCreateSurfaces(VADriverContextP context, int width, int height,
int format, int surfaces_count,
VASurfaceID *surfaces_ids);
VAStatus SunxiCedrusDestroySurfaces(VADriverContextP context,
VASurfaceID *surfaces_ids,
int surfaces_count);
VAStatus SunxiCedrusSyncSurface(VADriverContextP context,
VASurfaceID surface_id);
VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP context,
VAStatus RequestDestroySurfaces(VADriverContextP context,
VASurfaceID *surfaces_ids, int surfaces_count);
VAStatus RequestSyncSurface(VADriverContextP context, VASurfaceID surface_id);
VAStatus RequestQuerySurfaceStatus(VADriverContextP context,
VASurfaceID surface_id,
VASurfaceStatus *status);
VAStatus SunxiCedrusPutSurface(VADriverContextP context, VASurfaceID surface_id,
VAStatus RequestPutSurface(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 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 RequestLockSurface(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);
VAStatus RequestUnlockSurface(VADriverContextP context, VASurfaceID surface_id);
#endif