Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc1f0cbe authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm-vidc: return unknown ctrl for internal cvp client"

parents b3dd55ab 46f2efd4

msm/vidc/msm_cvp_internal.c

+4 −4
Original line number Diff line number Diff line
@@ -510,11 +510,11 @@ int msm_vidc_cvp(struct msm_vidc_inst *inst, struct msm_vidc_arg *arg) 


static struct msm_vidc_ctrl msm_cvp_ctrls[] = {

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_SECURE,

		.name = "Secure mode",

		.type = V4L2_CTRL_TYPE_BUTTON,

		.id = V4L2_CID_MPEG_VIDEO_UNKNOWN,

		.name = "Invalid control",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 0,

		.maximum = 1,

		.maximum = 0,

		.default_value = 0,

		.step = 1,

		.menu_skip_mask = 0,

msm/vidc/msm_vidc_common.h

+4 −0
Original line number Diff line number Diff line
@@ -65,6 +65,10 @@ static inline struct v4l2_ctrl *get_ctrl(struct msm_vidc_inst *inst, 
{

	int i;



	if (inst->session_type == MSM_VIDC_CVP &&

	    inst->core->resources.cvp_internal)

		return inst->ctrls[0];



	for (i = 0; i < inst->num_ctrls; i++) {

		if (inst->ctrls[i]->id == id)

			return inst->ctrls[i];