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

config: Use object config structure directly instead of abstract type

Browse Source 
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
This commit is contained in:
Paul Kocialkowski
2018-04-23 10:13:05 +02:00
parent 0bd492f0d3
commit 36b7bba14f
5 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/context.c
+1 -1
View File
@@ -51,7 +51,7 @@ VAStatus sunxi_cedrus_CreateContext(VADriverContextP ctx, VAConfigID config_id,
{ {
INIT_DRIVER_DATA INIT_DRIVER_DATA
VAStatus vaStatus = VA_STATUS_SUCCESS; VAStatus vaStatus = VA_STATUS_SUCCESS;
object_config_p obj_config; struct object_config *obj_config;
int i; int i;
struct v4l2_create_buffers create_bufs; struct v4l2_create_buffers create_bufs;
struct v4l2_format fmt; struct v4l2_format fmt;
src/picture.c
+2 -2
View File
@@ -87,7 +87,7 @@ VAStatus sunxi_cedrus_RenderPicture(VADriverContextP ctx, VAContextID context,
VAStatus vaStatus = VA_STATUS_SUCCESS; VAStatus vaStatus = VA_STATUS_SUCCESS;
struct object_context *obj_context; struct object_context *obj_context;
struct object_surface *obj_surface; struct object_surface *obj_surface;
object_config_p obj_config; struct object_config *obj_config;
int i; int i;
obj_context = CONTEXT(context); obj_context = CONTEXT(context);
@@ -152,7 +152,7 @@ VAStatus sunxi_cedrus_EndPicture(VADriverContextP ctx, VAContextID context)
struct v4l2_ext_control ctrl; struct v4l2_ext_control ctrl;
struct v4l2_ext_controls ctrls; struct v4l2_ext_controls ctrls;
struct media_request_new media_request; struct media_request_new media_request;
object_config_p obj_config; struct object_config *obj_config;
int request_fd; int request_fd;
int rc; int rc;
src/sunxi_cedrus_drv_video.c
+3 -3
View File
@@ -65,7 +65,7 @@ VAStatus sunxi_cedrus_Terminate(VADriverContextP ctx)
{ {
INIT_DRIVER_DATA INIT_DRIVER_DATA
struct object_buffer *obj_buffer; struct object_buffer *obj_buffer;
object_config_p obj_config; struct object_config *obj_config;
object_heap_iterator iter; object_heap_iterator iter;
for (int i = 0; i < INPUT_BUFFERS_NB; i++) for (int i = 0; i < INPUT_BUFFERS_NB; i++)
@@ -88,11 +88,11 @@ VAStatus sunxi_cedrus_Terminate(VADriverContextP ctx)
object_heap_destroy(&driver_data->context_heap); object_heap_destroy(&driver_data->context_heap);
/* Clean up configIDs */ /* Clean up configIDs */
obj_config = (object_config_p) object_heap_first(&driver_data->config_heap, &iter); obj_config = (struct object_config *) object_heap_first(&driver_data->config_heap, &iter);
while (obj_config) while (obj_config)
{ {
object_heap_free(&driver_data->config_heap, (object_base_p) obj_config); object_heap_free(&driver_data->config_heap, (object_base_p) obj_config);
obj_config = (object_config_p) object_heap_next(&driver_data->config_heap, &iter); obj_config = (struct object_config *) object_heap_next(&driver_data->config_heap, &iter);
} }
object_heap_destroy(&driver_data->config_heap); object_heap_destroy(&driver_data->config_heap);
src/va_config.c
+4 -4
View File
@@ -123,7 +123,7 @@ VAStatus sunxi_cedrus_GetConfigAttributes(VADriverContextP ctx,
return VA_STATUS_SUCCESS; return VA_STATUS_SUCCESS;
} }
VAStatus sunxi_cedrus_update_attribute(object_config_p obj_config, VAStatus sunxi_cedrus_update_attribute(struct object_config *obj_config,
VAConfigAttrib *attrib) VAConfigAttrib *attrib)
{ {
int i; int i;
@@ -155,7 +155,7 @@ VAStatus sunxi_cedrus_CreateConfig(VADriverContextP ctx, VAProfile profile,
INIT_DRIVER_DATA INIT_DRIVER_DATA
VAStatus vaStatus; VAStatus vaStatus;
int configID; int configID;
object_config_p obj_config; struct object_config *obj_config;
int i; int i;
/* Validate profile & entrypoint */ /* Validate profile & entrypoint */
@@ -220,7 +220,7 @@ VAStatus sunxi_cedrus_DestroyConfig(VADriverContextP ctx, VAConfigID config_id)
{ {
INIT_DRIVER_DATA INIT_DRIVER_DATA
VAStatus vaStatus; VAStatus vaStatus;
object_config_p obj_config; struct object_config *obj_config;
obj_config = CONFIG(config_id); obj_config = CONFIG(config_id);
if (NULL == obj_config) if (NULL == obj_config)
@@ -240,7 +240,7 @@ VAStatus sunxi_cedrus_QueryConfigAttributes(VADriverContextP ctx,
{ {
INIT_DRIVER_DATA INIT_DRIVER_DATA
VAStatus vaStatus = VA_STATUS_SUCCESS; VAStatus vaStatus = VA_STATUS_SUCCESS;
object_config_p obj_config; struct object_config *obj_config;
int i; int i;
obj_config = CONFIG(config_id); obj_config = CONFIG(config_id);
src/va_config.h
+2 -4
View File
@@ -30,7 +30,7 @@
#include "object_heap.h" #include "object_heap.h"
#define CONFIG(id) ((object_config_p) object_heap_lookup(&driver_data->config_heap, id)) #define CONFIG(id) ((struct object_config *) object_heap_lookup(&driver_data->config_heap, id))
#define CONFIG_ID_OFFSET 0x01000000 #define CONFIG_ID_OFFSET 0x01000000
struct object_config { struct object_config {
@@ -41,8 +41,6 @@ struct object_config {
int attrib_count; int attrib_count;
}; };
typedef struct object_config *object_config_p;
VAStatus sunxi_cedrus_QueryConfigProfiles(VADriverContextP ctx, VAStatus sunxi_cedrus_QueryConfigProfiles(VADriverContextP ctx,
VAProfile *profile_list, int *num_profiles); VAProfile *profile_list, int *num_profiles);
@@ -54,7 +52,7 @@ VAStatus sunxi_cedrus_GetConfigAttributes(VADriverContextP ctx,
VAProfile profile, VAEntrypoint entrypoint, VAProfile profile, VAEntrypoint entrypoint,
VAConfigAttrib *attrib_list, int num_attribs); VAConfigAttrib *attrib_list, int num_attribs);
VAStatus sunxi_cedrus_update_attribute(object_config_p obj_config, VAStatus sunxi_cedrus_update_attribute(struct object_config *obj_config,
VAConfigAttrib *attrib); VAConfigAttrib *attrib);
VAStatus sunxi_cedrus_CreateConfig(VADriverContextP ctx, VAProfile profile, VAStatus sunxi_cedrus_CreateConfig(VADriverContextP ctx, VAProfile profile,