Merge "msm: vidc: venc: v4l2 checks for extended controls." into msm-4.9 (c955e56c) · Commits · e / devices / android_kernel_fairphone_FP3

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -886,6 +886,16 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = {
		.step = 1,
		.qmenu = NULL,
		},
		{
		.id = V4L2_CID_MPEG_VIDC_VIDEO_LAYER_ID,
		.name = "Layer ID for different settings",
		.type = V4L2_CTRL_TYPE_INTEGER,
		.minimum = 0,
		.maximum = 6,
		.default_value = 0,
		.step = 1,
		.qmenu = NULL,
		},
		{
		.id = V4L2_CID_MPEG_VIDC_VENC_PARAM_SAR_WIDTH,
		.name = "SAR Width",
		@@ -2437,6 +2447,9 @@ int msm_venc_s_ext_ctrl(struct msm_vidc_inst *inst,
		return -EINVAL;
		}

		/* This will check the range for contols and clip if necessary */
		v4l2_try_ext_ctrls(&inst->ctrl_handler, ctrl);

		hdev = inst->core->device;
		cap = &inst->capability;