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

codecs: pass the context to the controls function as well

Browse Source 
Some functions setting the controls will need the context in the future.
Make sure that we provide it as an argument.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
This commit is contained in:
Maxime Ripard
2018-07-16 14:13:16 +02:00
parent 5aeb07f8bf
commit acc0cf3475
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/h264.c
+1
View File
@@ -231,6 +231,7 @@ static void h264_va_slice_to_v4l2(struct cedrus_data *driver_data,
} }
int h264_set_controls(struct cedrus_data *driver_data, int h264_set_controls(struct cedrus_data *driver_data,
struct object_context *context,
struct object_surface *surface) struct object_surface *surface)
{ {
struct v4l2_ctrl_h264_scaling_matrix matrix = { 0 }; struct v4l2_ctrl_h264_scaling_matrix matrix = { 0 };
src/h264.h
+4 -1
View File
@@ -27,9 +27,12 @@
#ifndef _H264_H_ #ifndef _H264_H_
#define _H264_H_ #define _H264_H_
struct object_context;
struct object_surface; struct object_surface;
struct cedrus_data; struct cedrus_data;
int h264_set_controls(struct cedrus_data *data, struct object_surface *surface); int h264_set_controls(struct cedrus_data *data,
struct object_context *context,
struct object_surface *surface);
#endif #endif
src/mpeg2.c
+1
View File
@@ -39,6 +39,7 @@
#include "v4l2.h" #include "v4l2.h"
int mpeg2_set_controls(struct cedrus_data *driver_data, int mpeg2_set_controls(struct cedrus_data *driver_data,
struct object_context *context_object,
struct object_surface *surface_object) struct object_surface *surface_object)
{ {
VAPictureParameterBufferMPEG2 *parameters = VAPictureParameterBufferMPEG2 *parameters =
src/mpeg2.h
+2
View File
@@ -26,10 +26,12 @@
#ifndef _MPEG2_H_ #ifndef _MPEG2_H_
#define _MPEG2_H_ #define _MPEG2_H_
struct object_context;
struct object_surface; struct object_surface;
struct cedrus_data; struct cedrus_data;
int mpeg2_set_controls(struct cedrus_data *driver_data, int mpeg2_set_controls(struct cedrus_data *driver_data,
struct object_context *context,
struct object_surface *surface_object); struct object_surface *surface_object);
#endif #endif
src/picture.c
+5 -4
View File
@@ -131,6 +131,7 @@ static VAStatus codec_store_buffer(struct cedrus_data *driver_data,
} }
static VAStatus codec_set_controls(struct cedrus_data *driver_data, static VAStatus codec_set_controls(struct cedrus_data *driver_data,
struct object_context *context,
VAProfile profile, VAProfile profile,
struct object_surface *surface_object) struct object_surface *surface_object)
{ {
@@ -139,7 +140,7 @@ static VAStatus codec_set_controls(struct cedrus_data *driver_data,
switch (profile) { switch (profile) {
case VAProfileMPEG2Simple: case VAProfileMPEG2Simple:
case VAProfileMPEG2Main: case VAProfileMPEG2Main:
rc = mpeg2_set_controls(driver_data, surface_object); rc = mpeg2_set_controls(driver_data, context, surface_object);
if (rc < 0) if (rc < 0)
return VA_STATUS_ERROR_OPERATION_FAILED; return VA_STATUS_ERROR_OPERATION_FAILED;
break; break;
@@ -149,7 +150,7 @@ static VAStatus codec_set_controls(struct cedrus_data *driver_data,
case VAProfileH264ConstrainedBaseline: case VAProfileH264ConstrainedBaseline:
case VAProfileH264MultiviewHigh: case VAProfileH264MultiviewHigh:
case VAProfileH264StereoHigh: case VAProfileH264StereoHigh:
rc = h264_set_controls(driver_data, surface_object); rc = h264_set_controls(driver_data, context, surface_object);
if (rc < 0) if (rc < 0)
return VA_STATUS_ERROR_OPERATION_FAILED; return VA_STATUS_ERROR_OPERATION_FAILED;
break; break;
@@ -259,8 +260,8 @@ VAStatus SunxiCedrusEndPicture(VADriverContextP context, VAContextID context_id)
surface_object->request_fd = request_fd; surface_object->request_fd = request_fd;
} }
rc = codec_set_controls(driver_data, config_object->profile, rc = codec_set_controls(driver_data, context_object,
surface_object); config_object->profile, surface_object);
if (rc != VA_STATUS_SUCCESS) if (rc != VA_STATUS_SUCCESS)
return rc; return rc;