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

Remove INIT_DRIVER_DATA and replace it with explicit definition

Browse Source 
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
This commit is contained in:
Paul Kocialkowski
2018-04-23 10:34:30 +02:00
parent 4354922570
commit b0a8023644
10 changed files with 59 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/buffer.c
+10 -5
View File
@@ -46,7 +46,8 @@ VAStatus sunxi_cedrus_CreateBuffer(VADriverContextP ctx, VAContextID context,
VABufferType type, unsigned int size, unsigned int num_elements, VABufferType type, unsigned int size, unsigned int num_elements,
void *data, VABufferID *buf_id) void *data, VABufferID *buf_id)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
int bufferID; int bufferID;
struct v4l2_plane plane[1]; struct v4l2_plane plane[1];
struct object_buffer *obj_buffer; struct object_buffer *obj_buffer;
@@ -121,7 +122,8 @@ VAStatus sunxi_cedrus_CreateBuffer(VADriverContextP ctx, VAContextID context,
VAStatus sunxi_cedrus_BufferSetNumElements(VADriverContextP ctx, VAStatus sunxi_cedrus_BufferSetNumElements(VADriverContextP ctx,
VABufferID buf_id, unsigned int num_elements) VABufferID buf_id, unsigned int num_elements)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
VAStatus vaStatus = VA_STATUS_SUCCESS; VAStatus vaStatus = VA_STATUS_SUCCESS;
struct object_buffer *obj_buffer = BUFFER(buf_id); struct object_buffer *obj_buffer = BUFFER(buf_id);
assert(obj_buffer); assert(obj_buffer);
@@ -137,7 +139,8 @@ VAStatus sunxi_cedrus_BufferSetNumElements(VADriverContextP ctx,
VAStatus sunxi_cedrus_MapBuffer(VADriverContextP ctx, VABufferID buf_id, VAStatus sunxi_cedrus_MapBuffer(VADriverContextP ctx, VABufferID buf_id,
void **pbuf) void **pbuf)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
VAStatus vaStatus = VA_STATUS_ERROR_UNKNOWN; VAStatus vaStatus = VA_STATUS_ERROR_UNKNOWN;
struct object_buffer *obj_buffer = BUFFER(buf_id); struct object_buffer *obj_buffer = BUFFER(buf_id);
assert(obj_buffer); assert(obj_buffer);
@@ -158,7 +161,8 @@ VAStatus sunxi_cedrus_MapBuffer(VADriverContextP ctx, VABufferID buf_id,
VAStatus sunxi_cedrus_UnmapBuffer(VADriverContextP ctx, VABufferID buf_id) VAStatus sunxi_cedrus_UnmapBuffer(VADriverContextP ctx, VABufferID buf_id)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
struct object_buffer *obj_buffer = BUFFER(buf_id); struct object_buffer *obj_buffer = BUFFER(buf_id);
if (obj_buffer == NULL) if (obj_buffer == NULL)
@@ -186,7 +190,8 @@ void sunxi_cedrus_destroy_buffer(struct sunxi_cedrus_driver_data *driver_data,
VAStatus sunxi_cedrus_DestroyBuffer(VADriverContextP ctx, VABufferID buffer_id) VAStatus sunxi_cedrus_DestroyBuffer(VADriverContextP ctx, VABufferID buffer_id)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
struct object_buffer *obj_buffer = BUFFER(buffer_id); struct object_buffer *obj_buffer = BUFFER(buffer_id);
assert(obj_buffer); assert(obj_buffer);
src/context.c
+4 -2
View File
@@ -49,7 +49,8 @@ VAStatus sunxi_cedrus_CreateContext(VADriverContextP ctx, VAConfigID config_id,
VASurfaceID *render_targets, int num_render_targets, VASurfaceID *render_targets, int num_render_targets,
VAContextID *context) VAContextID *context)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
VAStatus vaStatus = VA_STATUS_SUCCESS; VAStatus vaStatus = VA_STATUS_SUCCESS;
struct object_config *obj_config; struct object_config *obj_config;
int i; int i;
@@ -153,7 +154,8 @@ VAStatus sunxi_cedrus_CreateContext(VADriverContextP ctx, VAConfigID config_id,
VAStatus sunxi_cedrus_DestroyContext(VADriverContextP ctx, VAContextID context) VAStatus sunxi_cedrus_DestroyContext(VADriverContextP ctx, VAContextID context)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
struct object_context *obj_context = CONTEXT(context); struct object_context *obj_context = CONTEXT(context);
assert(obj_context); assert(obj_context);
enum v4l2_buf_type type; enum v4l2_buf_type type;
src/image.c
+6 -3
View File
@@ -50,7 +50,8 @@ VAStatus sunxi_cedrus_QueryImageFormats(VADriverContextP ctx,
VAStatus sunxi_cedrus_CreateImage(VADriverContextP ctx, VAImageFormat *format, VAStatus sunxi_cedrus_CreateImage(VADriverContextP ctx, VAImageFormat *format,
int width, int height, VAImage *image) int width, int height, VAImage *image)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
int sizeY, sizeUV; int sizeY, sizeUV;
struct object_image *obj_img; struct object_image *obj_img;
@@ -90,7 +91,8 @@ VAStatus sunxi_cedrus_CreateImage(VADriverContextP ctx, VAImageFormat *format,
VAStatus sunxi_cedrus_DeriveImage(VADriverContextP ctx, VASurfaceID surface, VAStatus sunxi_cedrus_DeriveImage(VADriverContextP ctx, VASurfaceID surface,
VAImage *image) VAImage *image)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
struct object_surface *obj_surface; struct object_surface *obj_surface;
VAImageFormat fmt; VAImageFormat fmt;
struct object_buffer *obj_buffer; struct object_buffer *obj_buffer;
@@ -119,7 +121,8 @@ VAStatus sunxi_cedrus_DeriveImage(VADriverContextP ctx, VASurfaceID surface,
VAStatus sunxi_cedrus_DestroyImage(VADriverContextP ctx, VAImageID image) VAStatus sunxi_cedrus_DestroyImage(VADriverContextP ctx, VAImageID image)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
struct object_image *obj_img; struct object_image *obj_img;
obj_img = IMAGE(image); obj_img = IMAGE(image);
src/mpeg2.c
+4 -2
View File
@@ -43,7 +43,8 @@ VAStatus sunxi_cedrus_render_mpeg2_slice_data(VADriverContextP ctx,
struct object_context *obj_context, struct object_surface *obj_surface, struct object_context *obj_context, struct object_surface *obj_surface,
struct object_buffer *obj_buffer) struct object_buffer *obj_buffer)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
VAStatus vaStatus = VA_STATUS_SUCCESS; VAStatus vaStatus = VA_STATUS_SUCCESS;
struct v4l2_buffer buf; struct v4l2_buffer buf;
struct v4l2_plane plane[1]; struct v4l2_plane plane[1];
@@ -56,7 +57,8 @@ VAStatus sunxi_cedrus_render_mpeg2_picture_parameter(VADriverContextP ctx,
struct object_context *obj_context, struct object_surface *obj_surface, struct object_context *obj_context, struct object_surface *obj_surface,
struct object_buffer *obj_buffer) struct object_buffer *obj_buffer)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
VAStatus vaStatus = VA_STATUS_SUCCESS; VAStatus vaStatus = VA_STATUS_SUCCESS;
VAPictureParameterBufferMPEG2 *pic_param = (VAPictureParameterBufferMPEG2 *)obj_buffer->buffer_data; VAPictureParameterBufferMPEG2 *pic_param = (VAPictureParameterBufferMPEG2 *)obj_buffer->buffer_data;
src/mpeg4.c
+4 -2
View File
@@ -43,7 +43,8 @@ VAStatus sunxi_cedrus_render_mpeg4_slice_data(VADriverContextP ctx,
struct object_context *obj_context, struct object_surface *obj_surface, struct object_context *obj_context, struct object_surface *obj_surface,
struct object_buffer *obj_buffer) struct object_buffer *obj_buffer)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
VAStatus vaStatus = VA_STATUS_SUCCESS; VAStatus vaStatus = VA_STATUS_SUCCESS;
struct v4l2_buffer buf; struct v4l2_buffer buf;
struct v4l2_plane plane[1]; struct v4l2_plane plane[1];
@@ -74,7 +75,8 @@ VAStatus sunxi_cedrus_render_mpeg4_picture_parameter(VADriverContextP ctx,
struct object_context *obj_context, struct object_surface *obj_surface, struct object_context *obj_context, struct object_surface *obj_surface,
struct object_buffer *obj_buffer) struct object_buffer *obj_buffer)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
VAStatus vaStatus = VA_STATUS_SUCCESS; VAStatus vaStatus = VA_STATUS_SUCCESS;
VAPictureParameterBufferMPEG4 *pic_param = (VAPictureParameterBufferMPEG4 *)obj_buffer->buffer_data; VAPictureParameterBufferMPEG4 *pic_param = (VAPictureParameterBufferMPEG4 *)obj_buffer->buffer_data;
src/picture.c
+6 -3
View File
@@ -53,7 +53,8 @@
VAStatus sunxi_cedrus_BeginPicture(VADriverContextP ctx, VAContextID context, VAStatus sunxi_cedrus_BeginPicture(VADriverContextP ctx, VAContextID context,
VASurfaceID render_target) VASurfaceID render_target)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
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;
@@ -83,7 +84,8 @@ VAStatus sunxi_cedrus_BeginPicture(VADriverContextP ctx, VAContextID context,
VAStatus sunxi_cedrus_RenderPicture(VADriverContextP ctx, VAContextID context, VAStatus sunxi_cedrus_RenderPicture(VADriverContextP ctx, VAContextID context,
VABufferID *buffers, int num_buffers) VABufferID *buffers, int num_buffers)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
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;
@@ -142,7 +144,8 @@ VAStatus sunxi_cedrus_RenderPicture(VADriverContextP ctx, VAContextID context,
VAStatus sunxi_cedrus_EndPicture(VADriverContextP ctx, VAContextID context) VAStatus sunxi_cedrus_EndPicture(VADriverContextP ctx, VAContextID context)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
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;
src/sunxi_cedrus.c
+4 -2
View File
@@ -63,7 +63,8 @@ void sunxi_cedrus_msg(const char *msg, ...)
/* Free memory and close v4l device */ /* Free memory and close v4l device */
VAStatus sunxi_cedrus_Terminate(VADriverContextP ctx) VAStatus sunxi_cedrus_Terminate(VADriverContextP ctx)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
struct object_buffer *obj_buffer; struct object_buffer *obj_buffer;
struct object_config *obj_config; struct object_config *obj_config;
object_heap_iterator iter; object_heap_iterator iter;
@@ -169,7 +170,8 @@ VAStatus VA_DRIVER_INIT_FUNC(VADriverContextP ctx)
vtable->vaUnlockSurface = sunxi_cedrus_UnlockSurface; vtable->vaUnlockSurface = sunxi_cedrus_UnlockSurface;
vtable->vaBufferInfo = sunxi_cedrus_BufferInfo; vtable->vaBufferInfo = sunxi_cedrus_BufferInfo;
driver_data = (struct sunxi_cedrus_driver_data *) malloc(sizeof(*driver_data)); driver_data =
(struct sunxi_cedrus_driver_data *) malloc(sizeof(*driver_data));
ctx->pDriverData = (void *) driver_data; ctx->pDriverData = (void *) driver_data;
assert(object_heap_init(&driver_data->config_heap, assert(object_heap_init(&driver_data->config_heap,
src/sunxi_cedrus.h
+3 -5
View File
@@ -23,8 +23,8 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#ifndef _SUNXI_CEDRUS_DRV_VIDEO_H_ #ifndef _SUNXI_CEDRUS_H_
#define _SUNXI_CEDRUS_DRV_VIDEO_H_ #define _SUNXI_CEDRUS_H_
#include <va/va.h> #include <va/va.h>
#include "object_heap.h" #include "object_heap.h"
@@ -32,8 +32,6 @@
#include <linux/videodev2.h> #include <linux/videodev2.h>
#define INIT_DRIVER_DATA struct sunxi_cedrus_driver_data * const driver_data = (struct sunxi_cedrus_driver_data *) ctx->pDriverData;
#define SUNXI_CEDRUS_STR_VENDOR "Sunxi Cedrus Driver 1.0" #define SUNXI_CEDRUS_STR_VENDOR "Sunxi Cedrus Driver 1.0"
#define SUNXI_CEDRUS_MAX_PROFILES 11 #define SUNXI_CEDRUS_MAX_PROFILES 11
@@ -59,4 +57,4 @@ struct sunxi_cedrus_driver_data {
int slice_offset[INPUT_BUFFERS_NB]; int slice_offset[INPUT_BUFFERS_NB];
}; };
#endif /* _SUNXI_CEDRUS_DRV_VIDEO_H_ */ #endif /* _SUNXI_CEDRUS_H_ */
src/surface.c
+10 -5
View File
@@ -55,7 +55,8 @@
VAStatus sunxi_cedrus_CreateSurfaces(VADriverContextP ctx, int width, VAStatus sunxi_cedrus_CreateSurfaces(VADriverContextP ctx, int width,
int height, int format, int num_surfaces, VASurfaceID *surfaces) int height, int format, int num_surfaces, VASurfaceID *surfaces)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
VAStatus vaStatus = VA_STATUS_SUCCESS; VAStatus vaStatus = VA_STATUS_SUCCESS;
int i; int i;
struct v4l2_buffer buf; struct v4l2_buffer buf;
@@ -144,7 +145,8 @@ VAStatus sunxi_cedrus_CreateSurfaces(VADriverContextP ctx, int width,
VAStatus sunxi_cedrus_DestroySurfaces(VADriverContextP ctx, VAStatus sunxi_cedrus_DestroySurfaces(VADriverContextP ctx,
VASurfaceID *surface_list, int num_surfaces) VASurfaceID *surface_list, int num_surfaces)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
int i; int i;
for(i = num_surfaces; i--;) for(i = num_surfaces; i--;)
{ {
@@ -158,7 +160,8 @@ VAStatus sunxi_cedrus_DestroySurfaces(VADriverContextP ctx,
VAStatus sunxi_cedrus_SyncSurface(VADriverContextP ctx, VAStatus sunxi_cedrus_SyncSurface(VADriverContextP ctx,
VASurfaceID render_target) VASurfaceID render_target)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->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];
@@ -225,7 +228,8 @@ VAStatus sunxi_cedrus_SyncSurface(VADriverContextP ctx,
VAStatus sunxi_cedrus_QuerySurfaceStatus(VADriverContextP ctx, VAStatus sunxi_cedrus_QuerySurfaceStatus(VADriverContextP ctx,
VASurfaceID render_target, VASurfaceStatus *status) VASurfaceID render_target, VASurfaceStatus *status)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
VAStatus vaStatus = VA_STATUS_SUCCESS; VAStatus vaStatus = VA_STATUS_SUCCESS;
struct object_surface *obj_surface; struct object_surface *obj_surface;
@@ -245,7 +249,8 @@ VAStatus sunxi_cedrus_PutSurface(VADriverContextP ctx, VASurfaceID surface,
VARectangle *cliprects, unsigned int number_cliprects, VARectangle *cliprects, unsigned int number_cliprects,
unsigned int flags) unsigned int flags)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
GC gc; GC gc;
Display *display; Display *display;
const XID xid = (XID)(uintptr_t)draw; const XID xid = (XID)(uintptr_t)draw;
src/va_config.c
+8 -4
View File
@@ -42,7 +42,8 @@
VAStatus sunxi_cedrus_QueryConfigProfiles(VADriverContextP ctx, VAStatus sunxi_cedrus_QueryConfigProfiles(VADriverContextP ctx,
VAProfile *profile_list, int *num_profiles) VAProfile *profile_list, int *num_profiles)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
int i = 0; int i = 0;
struct v4l2_fmtdesc vid_fmtdesc; struct v4l2_fmtdesc vid_fmtdesc;
memset(&vid_fmtdesc, 0, sizeof(vid_fmtdesc)); memset(&vid_fmtdesc, 0, sizeof(vid_fmtdesc));
@@ -152,7 +153,8 @@ VAStatus sunxi_cedrus_CreateConfig(VADriverContextP ctx, VAProfile profile,
VAEntrypoint entrypoint, VAConfigAttrib *attrib_list, VAEntrypoint entrypoint, VAConfigAttrib *attrib_list,
int num_attribs, VAConfigID *config_id) int num_attribs, VAConfigID *config_id)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
VAStatus vaStatus; VAStatus vaStatus;
int configID; int configID;
struct object_config *obj_config; struct object_config *obj_config;
@@ -218,7 +220,8 @@ VAStatus sunxi_cedrus_CreateConfig(VADriverContextP ctx, VAProfile profile,
VAStatus sunxi_cedrus_DestroyConfig(VADriverContextP ctx, VAConfigID config_id) VAStatus sunxi_cedrus_DestroyConfig(VADriverContextP ctx, VAConfigID config_id)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
VAStatus vaStatus; VAStatus vaStatus;
struct object_config *obj_config; struct object_config *obj_config;
@@ -238,7 +241,8 @@ VAStatus sunxi_cedrus_QueryConfigAttributes(VADriverContextP ctx,
VAEntrypoint *entrypoint, VAConfigAttrib *attrib_list, VAEntrypoint *entrypoint, VAConfigAttrib *attrib_list,
int *num_attribs) int *num_attribs)
{ {
INIT_DRIVER_DATA struct sunxi_cedrus_driver_data *driver_data =
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
VAStatus vaStatus = VA_STATUS_SUCCESS; VAStatus vaStatus = VA_STATUS_SUCCESS;
struct object_config *obj_config; struct object_config *obj_config;
int i; int i;