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

Commit dd4c3127 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: fix failure to set LTR with index value"

parents d6ec3df4 198dfba5

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

+3 −3
Original line number Diff line number Diff line
@@ -758,7 +758,7 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_USELTRFRAME,

		.name = "H264 Use LTR",

		.type = V4L2_CTRL_TYPE_BUTTON,

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 0,

		.maximum = (MAX_LTR_FRAME_COUNT - 1),

		.default_value = 0,
@@ -788,7 +788,7 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_MARKLTRFRAME,

		.name = "H264 Mark LTR",

		.type = V4L2_CTRL_TYPE_BUTTON,

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 0,

		.maximum = (MAX_LTR_FRAME_COUNT - 1),

		.default_value = 0,
@@ -2353,7 +2353,7 @@ static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_USELTRFRAME:

		property_id = HAL_CONFIG_VENC_USELTRFRAME;

		useltr.refltr = ctrl->val;

		useltr.refltr = (1 << ctrl->val);

		useltr.useconstrnt = false;

		useltr.frames = 0;

		pdata = &useltr;