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