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

Commit 0f1b9198 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Communicate ref_ltr in bitmap as expected by firmware"

parents 8fa4e15a 1e0f5949

drivers/media/platform/msm/vidc/msm_venc.c

+19 −1
Original line number Diff line number Diff line
@@ -2992,13 +2992,31 @@ static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		atomic_inc(&inst->seq_hdr_reqs);

		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_USELTRFRAME:

		if (ctrl->val < inst->capability.ltr_count.min ||

			ctrl->val >= inst->capability.ltr_count.max) {

			dprintk(VIDC_ERR,

				"Error setting useltr %d range: [%d,%d)\n",

				ctrl->val, inst->capability.ltr_count.min,

				inst->capability.ltr_count.max);

			rc = -ENOTSUPP;

			break;

		}

		property_id = HAL_CONFIG_VENC_USELTRFRAME;

		use_ltr.ref_ltr = ctrl->val;

		use_ltr.ref_ltr = (0x1 << ctrl->val);

		use_ltr.use_constraint = false;

		use_ltr.frames = 0;

		pdata = &use_ltr;

		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_MARKLTRFRAME:

		if (ctrl->val < inst->capability.ltr_count.min ||

			ctrl->val >= inst->capability.ltr_count.max) {

			dprintk(VIDC_ERR,

				"Error setting markltr %d range: [%d,%d)\n",

				ctrl->val, inst->capability.ltr_count.min,

				inst->capability.ltr_count.max);

			rc = -ENOTSUPP;

			break;

		}

		property_id = HAL_CONFIG_VENC_MARKLTRFRAME;

		mark_ltr.mark_frame = ctrl->val;

		pdata = &mark_ltr;