tree: Rename cedrus_data to request_data
The cedrus_data structure carries the old name. In order to migrate to the new name, let's rename it to request_data. Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
This commit is contained in:
+12
-12
@@ -44,8 +44,8 @@ VAStatus RequestCreateBuffer(VADriverContextP context, VAContextID context_id,
|
||||
unsigned int count, void *data,
|
||||
VABufferID *buffer_id)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
struct object_buffer *buffer_object = NULL;
|
||||
void *buffer_data;
|
||||
VAStatus status;
|
||||
@@ -102,8 +102,8 @@ complete:
|
||||
|
||||
VAStatus RequestDestroyBuffer(VADriverContextP context, VABufferID buffer_id)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
struct object_buffer *buffer_object;
|
||||
|
||||
buffer_object = BUFFER(driver_data, buffer_id);
|
||||
@@ -122,8 +122,8 @@ VAStatus RequestDestroyBuffer(VADriverContextP context, VABufferID buffer_id)
|
||||
VAStatus RequestMapBuffer(VADriverContextP context, VABufferID buffer_id,
|
||||
void **data_map)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
struct object_buffer *buffer_object;
|
||||
|
||||
buffer_object = BUFFER(driver_data, buffer_id);
|
||||
@@ -138,8 +138,8 @@ VAStatus RequestMapBuffer(VADriverContextP context, VABufferID buffer_id,
|
||||
|
||||
VAStatus RequestUnmapBuffer(VADriverContextP context, VABufferID buffer_id)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
struct object_buffer *buffer_object;
|
||||
|
||||
buffer_object = BUFFER(driver_data, buffer_id);
|
||||
@@ -154,8 +154,8 @@ VAStatus RequestUnmapBuffer(VADriverContextP context, VABufferID buffer_id)
|
||||
VAStatus RequestBufferSetNumElements(VADriverContextP context,
|
||||
VABufferID buffer_id, unsigned int count)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
struct object_buffer *buffer_object;
|
||||
|
||||
buffer_object = BUFFER(driver_data, buffer_id);
|
||||
@@ -174,8 +174,8 @@ VAStatus RequestBufferInfo(VADriverContextP context, VABufferID buffer_id,
|
||||
VABufferType *type, unsigned int *size,
|
||||
unsigned int *count)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
struct object_buffer *buffer_object;
|
||||
|
||||
buffer_object = BUFFER(driver_data, buffer_id);
|
||||
|
||||
+1
-1
@@ -50,7 +50,7 @@ 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,
|
||||
void sunxi_cedrus_destroy_buffer(struct request_data *driver_data,
|
||||
struct object_buffer *obj_buffer);
|
||||
VAStatus RequestDestroyBuffer(VADriverContextP context, VABufferID buffer_id);
|
||||
VAStatus RequestMapBuffer(VADriverContextP context, VABufferID buffer_id,
|
||||
|
||||
+8
-8
@@ -41,8 +41,8 @@ VAStatus RequestCreateConfig(VADriverContextP context, VAProfile profile,
|
||||
VAConfigAttrib *attributes, int attributes_count,
|
||||
VAConfigID *config_id)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
struct object_config *config_object;
|
||||
VAConfigID id;
|
||||
int i, index;
|
||||
@@ -91,8 +91,8 @@ VAStatus RequestCreateConfig(VADriverContextP context, VAProfile profile,
|
||||
|
||||
VAStatus RequestDestroyConfig(VADriverContextP context, VAConfigID config_id)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
struct object_config *config_object;
|
||||
|
||||
config_object = CONFIG(driver_data, config_id);
|
||||
@@ -108,8 +108,8 @@ VAStatus RequestDestroyConfig(VADriverContextP context, VAConfigID config_id)
|
||||
VAStatus RequestQueryConfigProfiles(VADriverContextP context,
|
||||
VAProfile *profiles, int *profiles_count)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
unsigned int index = 0;
|
||||
bool found;
|
||||
|
||||
@@ -168,8 +168,8 @@ VAStatus RequestQueryConfigAttributes(VADriverContextP context,
|
||||
VAConfigAttrib *attributes,
|
||||
int *attributes_count)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
struct object_config *config_object;
|
||||
int i;
|
||||
|
||||
|
||||
+4
-4
@@ -46,8 +46,8 @@ VAStatus RequestCreateContext(VADriverContextP context, VAConfigID config_id,
|
||||
VASurfaceID *surfaces_ids, int surfaces_count,
|
||||
VAContextID *context_id)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
struct object_config *config_object;
|
||||
struct object_surface *surface_object;
|
||||
struct object_context *context_object = NULL;
|
||||
@@ -195,8 +195,8 @@ complete:
|
||||
|
||||
VAStatus RequestDestroyContext(VADriverContextP context, VAContextID context_id)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
struct object_context *context_object;
|
||||
int rc;
|
||||
|
||||
|
||||
+5
-5
@@ -173,7 +173,7 @@ static void dpb_update(struct object_context *context,
|
||||
}
|
||||
}
|
||||
|
||||
static void h264_fill_dpb(struct cedrus_data *data,
|
||||
static void h264_fill_dpb(struct request_data *data,
|
||||
struct object_context *context,
|
||||
struct v4l2_ctrl_h264_decode_param *decode)
|
||||
{
|
||||
@@ -205,7 +205,7 @@ static void h264_fill_dpb(struct cedrus_data *data,
|
||||
}
|
||||
}
|
||||
|
||||
static void h264_va_picture_to_v4l2(struct cedrus_data *driver_data,
|
||||
static void h264_va_picture_to_v4l2(struct request_data *driver_data,
|
||||
struct object_context *context,
|
||||
struct object_surface *surface,
|
||||
VAPictureParameterBufferH264 *VAPicture,
|
||||
@@ -277,7 +277,7 @@ static void h264_va_picture_to_v4l2(struct cedrus_data *driver_data,
|
||||
sps->flags |= V4L2_H264_SPS_FLAG_DELTA_PIC_ORDER_ALWAYS_ZERO;
|
||||
}
|
||||
|
||||
static void h264_va_matrix_to_v4l2(struct cedrus_data *driver_data,
|
||||
static void h264_va_matrix_to_v4l2(struct request_data *driver_data,
|
||||
struct object_context *context,
|
||||
VAIQMatrixBufferH264 *VAMatrix,
|
||||
struct v4l2_ctrl_h264_scaling_matrix *v4l2_matrix)
|
||||
@@ -318,7 +318,7 @@ static void h264_copy_pred_table(struct v4l2_h264_weight_factors *factors,
|
||||
}
|
||||
}
|
||||
|
||||
static void h264_va_slice_to_v4l2(struct cedrus_data *driver_data,
|
||||
static void h264_va_slice_to_v4l2(struct request_data *driver_data,
|
||||
struct object_context *context,
|
||||
VASliceParameterBufferH264 *VASlice,
|
||||
VAPictureParameterBufferH264 *VAPicture,
|
||||
@@ -400,7 +400,7 @@ static void h264_va_slice_to_v4l2(struct cedrus_data *driver_data,
|
||||
VASlice->chroma_offset_l1);
|
||||
}
|
||||
|
||||
int h264_set_controls(struct cedrus_data *driver_data,
|
||||
int h264_set_controls(struct request_data *driver_data,
|
||||
struct object_context *context,
|
||||
struct object_surface *surface)
|
||||
{
|
||||
|
||||
+2
-2
@@ -33,7 +33,7 @@
|
||||
|
||||
struct object_context;
|
||||
struct object_surface;
|
||||
struct cedrus_data;
|
||||
struct request_data;
|
||||
|
||||
#define H264_DPB_SIZE 16
|
||||
|
||||
@@ -50,7 +50,7 @@ struct h264_dpb {
|
||||
unsigned int age;
|
||||
};
|
||||
|
||||
int h264_set_controls(struct cedrus_data *data,
|
||||
int h264_set_controls(struct request_data *data,
|
||||
struct object_context *context,
|
||||
struct object_surface *surface);
|
||||
|
||||
|
||||
+6
-6
@@ -38,8 +38,8 @@
|
||||
VAStatus RequestCreateImage(VADriverContextP context, VAImageFormat *format,
|
||||
int width, int height, VAImage *image)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
unsigned int destination_sizes[VIDEO_MAX_PLANES];
|
||||
unsigned int destination_bytesperlines[VIDEO_MAX_PLANES];
|
||||
unsigned int destination_planes_count;
|
||||
@@ -99,8 +99,8 @@ VAStatus RequestCreateImage(VADriverContextP context, VAImageFormat *format,
|
||||
|
||||
VAStatus RequestDestroyImage(VADriverContextP context, VAImageID image_id)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
struct object_image *image_object;
|
||||
VAStatus status;
|
||||
|
||||
@@ -121,8 +121,8 @@ VAStatus RequestDestroyImage(VADriverContextP context, VAImageID image_id)
|
||||
VAStatus RequestDeriveImage(VADriverContextP context, VASurfaceID surface_id,
|
||||
VAImage *image)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
struct object_surface *surface_object;
|
||||
struct object_buffer *buffer_object;
|
||||
unsigned int i;
|
||||
|
||||
+1
-1
@@ -38,7 +38,7 @@
|
||||
|
||||
#include "v4l2.h"
|
||||
|
||||
int mpeg2_set_controls(struct cedrus_data *driver_data,
|
||||
int mpeg2_set_controls(struct request_data *driver_data,
|
||||
struct object_context *context_object,
|
||||
struct object_surface *surface_object)
|
||||
{
|
||||
|
||||
+2
-2
@@ -28,9 +28,9 @@
|
||||
|
||||
struct object_context;
|
||||
struct object_surface;
|
||||
struct cedrus_data;
|
||||
struct request_data;
|
||||
|
||||
int mpeg2_set_controls(struct cedrus_data *driver_data,
|
||||
int mpeg2_set_controls(struct request_data *driver_data,
|
||||
struct object_context *context,
|
||||
struct object_surface *surface_object);
|
||||
|
||||
|
||||
+8
-8
@@ -46,7 +46,7 @@
|
||||
#include "utils.h"
|
||||
#include "v4l2.h"
|
||||
|
||||
static VAStatus codec_store_buffer(struct cedrus_data *driver_data,
|
||||
static VAStatus codec_store_buffer(struct request_data *driver_data,
|
||||
VAProfile profile,
|
||||
struct object_surface *surface_object,
|
||||
struct object_buffer *buffer_object)
|
||||
@@ -131,7 +131,7 @@ static VAStatus codec_store_buffer(struct cedrus_data *driver_data,
|
||||
return VA_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static VAStatus codec_set_controls(struct cedrus_data *driver_data,
|
||||
static VAStatus codec_set_controls(struct request_data *driver_data,
|
||||
struct object_context *context,
|
||||
VAProfile profile,
|
||||
struct object_surface *surface_object)
|
||||
@@ -166,8 +166,8 @@ static VAStatus codec_set_controls(struct cedrus_data *driver_data,
|
||||
VAStatus RequestBeginPicture(VADriverContextP context, VAContextID context_id,
|
||||
VASurfaceID surface_id)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
struct object_context *context_object;
|
||||
struct object_surface *surface_object;
|
||||
|
||||
@@ -191,8 +191,8 @@ VAStatus RequestBeginPicture(VADriverContextP context, VAContextID context_id,
|
||||
VAStatus RequestRenderPicture(VADriverContextP context, VAContextID context_id,
|
||||
VABufferID *buffers_ids, int buffers_count)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
struct object_context *context_object;
|
||||
struct object_config *config_object;
|
||||
struct object_surface *surface_object;
|
||||
@@ -229,8 +229,8 @@ VAStatus RequestRenderPicture(VADriverContextP context, VAContextID context_id,
|
||||
|
||||
VAStatus RequestEndPicture(VADriverContextP context, VAContextID context_id)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
struct object_context *context_object;
|
||||
struct object_config *config_object;
|
||||
struct object_surface *surface_object;
|
||||
|
||||
+1
-1
@@ -43,7 +43,7 @@
|
||||
#define V4L2_REQUEST_MAX_SUBPIC_FORMATS 4
|
||||
#define V4L2_REQUEST_MAX_DISPLAY_ATTRIBUTES 4
|
||||
|
||||
struct cedrus_data {
|
||||
struct request_data {
|
||||
struct object_heap config_heap;
|
||||
struct object_heap context_heap;
|
||||
struct object_heap surface_heap;
|
||||
|
||||
+3
-3
@@ -57,7 +57,7 @@ VA_DRIVER_INIT_FUNC(VADriverContextP context);
|
||||
|
||||
VAStatus VA_DRIVER_INIT_FUNC(VADriverContextP context)
|
||||
{
|
||||
struct cedrus_data *driver_data;
|
||||
struct request_data *driver_data;
|
||||
struct VADriverVTable *vtable = context->vtable;
|
||||
struct v4l2_capability capability;
|
||||
VAStatus status;
|
||||
@@ -183,8 +183,8 @@ complete:
|
||||
|
||||
VAStatus RequestTerminate(VADriverContextP context)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
struct object_buffer *buffer_object;
|
||||
struct object_image *image_object;
|
||||
struct object_surface *surface_object;
|
||||
|
||||
+8
-8
@@ -46,8 +46,8 @@ VAStatus RequestCreateSurfaces(VADriverContextP context, int width, int height,
|
||||
int format, int surfaces_count,
|
||||
VASurfaceID *surfaces_ids)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
struct object_surface *surface_object;
|
||||
struct video_format *video_format;
|
||||
unsigned int destination_sizes[VIDEO_MAX_PLANES];
|
||||
@@ -175,8 +175,8 @@ VAStatus RequestCreateSurfaces(VADriverContextP context, int width, int height,
|
||||
VAStatus RequestDestroySurfaces(VADriverContextP context,
|
||||
VASurfaceID *surfaces_ids, int surfaces_count)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
struct object_surface *surface_object;
|
||||
unsigned int i, j;
|
||||
|
||||
@@ -211,8 +211,8 @@ VAStatus RequestDestroySurfaces(VADriverContextP context,
|
||||
|
||||
VAStatus RequestSyncSurface(VADriverContextP context, VASurfaceID surface_id)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
struct object_surface *surface_object;
|
||||
VAStatus status;
|
||||
int request_fd = -1;
|
||||
@@ -289,8 +289,8 @@ VAStatus RequestQuerySurfaceStatus(VADriverContextP context,
|
||||
VASurfaceID surface_id,
|
||||
VASurfaceStatus *status)
|
||||
{
|
||||
struct cedrus_data *driver_data =
|
||||
(struct cedrus_data *)context->pDriverData;
|
||||
struct request_data *driver_data =
|
||||
(struct request_data *)context->pDriverData;
|
||||
struct object_surface *surface_object;
|
||||
|
||||
surface_object = SURFACE(driver_data, surface_id);
|
||||
|
||||
Reference in New Issue
Block a user