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

Commit 268f1d01 authored by Deepak Kushwah's avatar Deepak Kushwah Committed by Gerrit - the friendly Code Review server
Browse files

msm: vidc: Fix masking of QP values for different codecs in driver 



Driver is masking QP values for different codecs, as same control
is used for all codecs.This change enables driver to
differentiate QP boundaries based on codec type.

Change-Id: Ibc8a64ab933bac85c72b2dd62f6988bad6d5c5fa
CRs-Fixed: 2011307
Signed-off-by: default avatarDeepak Kushwah <dkushwah@codeaurora.org>
parent edc93d8c

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

+346 −41
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -468,7 +468,7 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
	},

	{

		.id = V4L2_CID_MPEG_VIDEO_H264_I_FRAME_QP,

		.name = "I Frame Quantization",

		.name = "H264 I Frame Quantization",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 0,

		.maximum = 127,
@@ -479,7 +479,7 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
	},

	{

		.id = V4L2_CID_MPEG_VIDEO_H264_P_FRAME_QP,

		.name = "P Frame Quantization",

		.name = "H264 P Frame Quantization",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 0,

		.maximum = 127,
@@ -490,7 +490,7 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
	},

	{

		.id = V4L2_CID_MPEG_VIDEO_H264_B_FRAME_QP,

		.name = "B Frame Quantization",

		.name = "H264 B Frame Quantization",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 0,

		.maximum = 127,
@@ -499,6 +499,61 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.menu_skip_mask = 0,

		.qmenu = NULL,

	},

	{

		.id = V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP,

		.name = "H263 I Frame Quantization",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 1,

		.maximum = 31,

		.default_value = I_FRAME_QP,

		.step = 1,

		.menu_skip_mask = 0,

		.qmenu = NULL,

	},

	{

		.id = V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP,

		.name = "H263 P Frame Quantization",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 1,

		.maximum = 31,

		.default_value = P_FRAME_QP,

		.step = 1,

		.menu_skip_mask = 0,

		.qmenu = NULL,

	},

	{

		.id = V4L2_CID_MPEG_VIDEO_H263_B_FRAME_QP,

		.name = "H263 B Frame Quantization",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 1,

		.maximum = 31,

		.default_value = B_FRAME_QP,

		.step = 1,

		.menu_skip_mask = 0,

		.qmenu = NULL,

	},

	{

		.id = V4L2_CID_MPEG_VIDEO_VPX_I_FRAME_QP,

		.name = "VPX I Frame Quantization",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 0,

		.maximum = 127,

		.default_value = I_FRAME_QP,

		.step = 1,

		.menu_skip_mask = 0,

		.qmenu = NULL,

	},

	{

		.id = V4L2_CID_MPEG_VIDEO_VPX_P_FRAME_QP,

		.name = "VPX P Frame Quantization",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 0,

		.maximum = 127,

		.default_value = P_FRAME_QP,

		.step = 1,

		.menu_skip_mask = 0,

		.qmenu = NULL,

	},

	{

		.id = V4L2_CID_MPEG_VIDEO_H264_MIN_QP,

		.name = "H264 Minimum QP",
@@ -521,6 +576,24 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.menu_skip_mask = 0,

		.qmenu = NULL,

	},

	{

		.id = V4L2_CID_MPEG_VIDEO_VPX_MIN_QP,

		.name = "VPX Minimum QP",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 0,

		.maximum = 127,

		.default_value = 0,

		.step = 1,

	},

	{

		.id = V4L2_CID_MPEG_VIDEO_VPX_MAX_QP,

		.name = "VPX Maximum QP",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 0,

		.maximum = 127,

		.default_value = 127,

		.step = 1,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_VP8_MIN_QP,

		.name = "VP8 Minimum QP",
@@ -536,12 +609,11 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 1,

		.maximum = 128,

		.default_value = 1,



		.default_value = 128,

		.step = 1,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_MPEG4_MIN_QP,

		.id = V4L2_CID_MPEG_VIDEO_MPEG4_MIN_QP,

		.name = "MPEG4 Minimum QP",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 1,
@@ -550,7 +622,7 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.step = 1,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_MPEG4_MAX_QP,

		.id = V4L2_CID_MPEG_VIDEO_MPEG4_MAX_QP,

		.name = "MPEG4 Maximum QP",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 1,
@@ -959,35 +1031,65 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.step = 0,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_I_FRAME_QP,

		.id = V4L2_CID_MPEG_VIDC_VIDEO_INITIAL_I_FRAME_QP,

		.name = "Iframe initial QP",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 0,

		.minimum = 1,

		.maximum = 127,

		.default_value = 1,

		.step = 1,

		.qmenu = NULL,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_P_FRAME_QP,

		.id = V4L2_CID_MPEG_VIDC_VIDEO_INITIAL_P_FRAME_QP,

		.name = "Pframe initial QP",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 0,

		.minimum = 1,

		.maximum = 127,

		.default_value = 1,

		.step = 1,

		.qmenu = NULL,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_B_FRAME_QP,

		.id = V4L2_CID_MPEG_VIDC_VIDEO_INITIAL_B_FRAME_QP,

		.name = "Bframe initial QP",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 0,

		.minimum = 1,

		.maximum = 127,

		.default_value = 1,

		.step = 1,

		.qmenu = NULL,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_I_FRAME_QP,

		.name = "Iframe initial QP",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 1,

		.maximum = 51,

		.default_value = 1,

		.step = 1,

		.qmenu = NULL,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_P_FRAME_QP,

		.name = "Pframe initial QP",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 1,

		.maximum = 51,

		.default_value = 1,

		.step = 1,

		.qmenu = NULL,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_B_FRAME_QP,

		.name = "Bframe initial QP",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 1,

		.maximum = 51,

		.default_value = 1,

		.step = 1,

		.qmenu = NULL,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_IFRAME_X_RANGE,

		.name = "I-Frame X coordinate search range",
@@ -1323,26 +1425,6 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
	},

};



static struct v4l2_ctrl *get_ctrl_from_cluster(int id,

			struct v4l2_ctrl **cluster, int ncontrols);



/* Small helper macro for quickly getting a control and err checking */

#define TRY_GET_CTRL(__ctrl_id) ({ \

		struct v4l2_ctrl *__temp; \

		__temp = get_ctrl_from_cluster( \

			__ctrl_id, \

			ctrl->cluster, ctrl->ncontrols); \

		if (!__temp) { \

			dprintk(VIDC_ERR, "Can't find %s (%x) in cluster\n", \

				#__ctrl_id, __ctrl_id); \

			/* Clusters are hardcoded, if we can't find */ \

			/* something then things are massively screwed up */ \

			BUG_ON(1); \

		} \

		__temp; \

	})





#define NUM_CTRLS ARRAY_SIZE(msm_venc_ctrls)



static u32 get_frame_size_nv12(int plane, u32 height, u32 width)
@@ -2196,6 +2278,22 @@ unknown_value: 
	return -EINVAL;

}



/* Small helper macro for quickly getting a control and err checking */

#define TRY_GET_CTRL(__ctrl_id) ({ \

		struct v4l2_ctrl *__temp; \

		__temp = get_ctrl_from_cluster( \

			__ctrl_id, \

			ctrl->cluster, ctrl->ncontrols); \

		if (!__temp) { \

			dprintk(VIDC_ERR, "Can't find %s (%x) in cluster\n", \

				#__ctrl_id, __ctrl_id); \

			/* Clusters are hardcoded, if we can't find */ \

			/* something then things are massively screwed up */ \

			BUG_ON(1); \

		} \

		__temp; \

	})



static int msm_venc_validate_qp_value(struct msm_vidc_inst *inst,

					struct v4l2_ctrl *ctrl)

{
@@ -2214,23 +2312,24 @@ static int msm_venc_validate_qp_value(struct msm_vidc_inst *inst, 


	switch (inst->fmts[CAPTURE_PORT].fourcc) {

	case V4L2_PIX_FMT_VP8:

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDC_VIDEO_VP8_MAX_QP);

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_VPX_MAX_QP);

		max = temp_ctrl->maximum;

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDC_VIDEO_VP8_MIN_QP);

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_VPX_MIN_QP);

		min = temp_ctrl->minimum;

		if (!VALIDATE_BOUNDARIES(min, max, qp_value))

			rc = -EINVAL;

		break;

	case V4L2_PIX_FMT_H263:

	case V4L2_PIX_FMT_MPEG4:

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDC_VIDEO_MPEG4_MAX_QP);

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_MPEG4_MAX_QP);

		max = temp_ctrl->maximum;

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDC_VIDEO_MPEG4_MIN_QP);

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_MPEG4_MIN_QP);

		min = temp_ctrl->minimum;

		if (!VALIDATE_BOUNDARIES(min, max, qp_value))

			rc = -EINVAL;

		break;

	default:

	case V4L2_PIX_FMT_H264:

	case V4L2_PIX_FMT_HEVC:

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_H264_MAX_QP);

		max = temp_ctrl->maximum;

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_H264_MIN_QP);
@@ -2238,10 +2337,15 @@ static int msm_venc_validate_qp_value(struct msm_vidc_inst *inst, 
		if (!VALIDATE_BOUNDARIES(min, max, qp_value))

			rc = -EINVAL;

		break;

	default:

		dprintk(VIDC_ERR, "%s Invalid Codec\n", __func__);

		return -EINVAL;

	}

	return rc;

#undef VALIDATE_BOUNDARIES

}





static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl)

{

	int rc = 0;
@@ -2654,6 +2758,81 @@ static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		pdata = &quantization;

		break;

	}

	case V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP: {

		struct v4l2_ctrl *qpp, *qpb;



		qpp = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP);

		qpb = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_H263_B_FRAME_QP);



		property_id = HAL_PARAM_VENC_SESSION_QP;

		quantization.qpi = ctrl->val;

		quantization.qpp = qpp->val;

		quantization.qpb = qpb->val;

		quantization.layer_id = 0;



		pdata = &quantization;

		break;

	}

	case V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP: {

		struct v4l2_ctrl *qpi, *qpb;



		qpi = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP);

		qpb = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_H263_B_FRAME_QP);



		property_id = HAL_PARAM_VENC_SESSION_QP;

		quantization.qpp = ctrl->val;

		quantization.qpi = qpi->val;

		quantization.qpb = qpb->val;

		quantization.layer_id = 0;



		pdata = &quantization;

		break;

	}

	case V4L2_CID_MPEG_VIDEO_H263_B_FRAME_QP: {

		struct v4l2_ctrl *qpi, *qpp;



		qpi = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP);

		qpp = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP);



		property_id = HAL_PARAM_VENC_SESSION_QP;

		quantization.qpb = ctrl->val;

		quantization.qpi = qpi->val;

		quantization.qpp = qpp->val;

		quantization.layer_id = 0;



		pdata = &quantization;

		break;

	}

	case V4L2_CID_MPEG_VIDEO_VPX_I_FRAME_QP: {

		struct v4l2_ctrl *qpp;



		qpp = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_VPX_P_FRAME_QP);



		property_id = HAL_PARAM_VENC_SESSION_QP;

		quantization.qpi = ctrl->val;

		quantization.qpp = qpp->val;

		/* Bframes are not supported for VPX */

		quantization.qpb = 0;

		quantization.layer_id = 0;



		pdata = &quantization;

		break;

	}

	case V4L2_CID_MPEG_VIDEO_VPX_P_FRAME_QP: {

		struct v4l2_ctrl *qpi;



		qpi = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_VPX_I_FRAME_QP);



		property_id = HAL_PARAM_VENC_SESSION_QP;

		quantization.qpp = ctrl->val;

		quantization.qpi = qpi->val;

		/* Bframes are not supported for VPX */

		quantization.qpb = 0;

		quantization.layer_id = 0;



		pdata = &quantization;

		break;

	}

	case V4L2_CID_MPEG_VIDEO_H264_MIN_QP: {

		struct v4l2_ctrl *qp_max;
@@ -2694,8 +2873,85 @@ static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		pdata = &qp_range;

		break;

	}

	case V4L2_CID_MPEG_VIDEO_MPEG4_MIN_QP: {

		struct v4l2_ctrl *qp_max;



		qp_max = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_MPEG4_MAX_QP);

		if (ctrl->val >= qp_max->val) {

			dprintk(VIDC_ERR,

					"Bad range: Min QP (%d) > Max QP(%d)\n",

					ctrl->val, qp_max->val);

			rc = -ERANGE;

			break;

		}



		property_id = HAL_PARAM_VENC_SESSION_QP_RANGE;

		qp_range.layer_id = 0;

		qp_range.max_qp = qp_max->val;

		qp_range.min_qp = ctrl->val;



		pdata = &qp_range;

		break;

	}

	case V4L2_CID_MPEG_VIDEO_MPEG4_MAX_QP: {

		struct v4l2_ctrl *qp_min;



		qp_min = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_MPEG4_MIN_QP);

		if (ctrl->val <= qp_min->val) {

			dprintk(VIDC_ERR,

					"Bad range: Max QP (%d) < Min QP(%d)\n",

					ctrl->val, qp_min->val);

			rc = -ERANGE;

			break;

		}



		property_id = HAL_PARAM_VENC_SESSION_QP_RANGE;

		qp_range.layer_id = 0;

		qp_range.max_qp = ctrl->val;

		qp_range.min_qp = qp_min->val;



		pdata = &qp_range;

		break;

	}

	case V4L2_CID_MPEG_VIDEO_VPX_MIN_QP: {

		struct v4l2_ctrl *qp_max;



		qp_max = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_VPX_MAX_QP);

		if (ctrl->val >= qp_max->val) {

			dprintk(VIDC_ERR,

					"Bad range: Min QP (%d) > Max QP(%d)\n",

					ctrl->val, qp_max->val);

			rc = -ERANGE;

			break;

		}

		property_id = HAL_PARAM_VENC_SESSION_QP_RANGE;

		qp_range.layer_id = 0;

		qp_range.max_qp = qp_max->val;

		qp_range.min_qp = ctrl->val;

		pdata = &qp_range;

		break;

	}

	case V4L2_CID_MPEG_VIDEO_VPX_MAX_QP: {

		struct v4l2_ctrl *qp_min;



		qp_min = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_VPX_MIN_QP);

		if (ctrl->val <= qp_min->val) {

			dprintk(VIDC_ERR,

					"Bad range: Max QP (%d) < Min QP(%d)\n",

					ctrl->val, qp_min->val);

			rc = -ERANGE;

			break;

		}

		property_id = HAL_PARAM_VENC_SESSION_QP_RANGE;

		qp_range.layer_id = 0;

		qp_range.max_qp = ctrl->val;

		qp_range.min_qp = qp_min->val;

		pdata = &qp_range;

		break;

	}

	case V4L2_CID_MPEG_VIDC_VIDEO_VP8_MIN_QP: {

		struct v4l2_ctrl *qp_max;



		qp_max = TRY_GET_CTRL(V4L2_CID_MPEG_VIDC_VIDEO_VP8_MAX_QP);

		property_id = HAL_PARAM_VENC_SESSION_QP_RANGE;

		qp_range.layer_id = 0;
@@ -2706,6 +2962,7 @@ static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
	}

	case V4L2_CID_MPEG_VIDC_VIDEO_VP8_MAX_QP: {

		struct v4l2_ctrl *qp_min;



		qp_min = TRY_GET_CTRL(V4L2_CID_MPEG_VIDC_VIDEO_VP8_MIN_QP);

		property_id = HAL_PARAM_VENC_SESSION_QP_RANGE;

		qp_range.layer_id = 0;
@@ -3236,9 +3493,14 @@ static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		pdata = &baselayerid;

		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_CONFIG_QP:

		/* Sanity check for the QP boundaries as we are using

		 * same control to set dynamic QP for all the codecs

		 */

		rc = msm_venc_validate_qp_value(inst, ctrl);

		if (rc)

		if (rc) {

			dprintk(VIDC_ERR, "Invalid QP Config QP Range\n");

			break;

		}

		property_id = HAL_CONFIG_VENC_FRAME_QP;

		frameqp = ctrl->val;

		pdata = &frameqp;
@@ -3380,7 +3642,6 @@ static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
	}



	v4l2_ctrl_lock(ctrl);

#undef TRY_GET_CTRL



	if (!rc && property_id) {

		dprintk(VIDC_DBG, "Control: HAL property=%x,ctrl_value=%d\n",
@@ -3392,6 +3653,7 @@ static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 


	return rc;

}

#undef TRY_GET_CTRL



static int try_set_ext_ctrl(struct msm_vidc_inst *inst,

	struct v4l2_ext_controls *ctrl)
@@ -3408,6 +3670,7 @@ static int try_set_ext_ctrl(struct msm_vidc_inst *inst, 
	struct hal_aspect_ratio sar;

	struct hal_bitrate bitrate;

	struct hal_frame_size blur_res;

	struct v4l2_ctrl *temp_ctrl;



	if (!inst || !inst->core || !inst->core->device || !ctrl) {

		dprintk(VIDC_ERR, "%s invalid parameters\n", __func__);
@@ -3470,6 +3733,48 @@ static int try_set_ext_ctrl(struct msm_vidc_inst *inst, 
			property_id = HAL_PARAM_VENC_ENABLE_INITIAL_QP;

			pdata = &quant;

			break;

		case V4L2_CID_MPEG_VIDC_VIDEO_INITIAL_I_FRAME_QP:

			/* Sanity check for the QP boundaries as we are using

			 * same control to set Initial QP for all the codecs

			 */

			temp_ctrl->id =

				V4L2_CID_MPEG_VIDC_VIDEO_INITIAL_I_FRAME_QP;

			temp_ctrl->val = control[i].value;

			rc = msm_venc_validate_qp_value(inst, temp_ctrl);

			if (rc) {

				dprintk(VIDC_ERR, "Invalid Initial I QP\n");

				break;

			}

			quant.qpi = control[i].value;

			property_id = HAL_PARAM_VENC_ENABLE_INITIAL_QP;

			pdata = &quant;

			break;

		case V4L2_CID_MPEG_VIDC_VIDEO_INITIAL_P_FRAME_QP:

			temp_ctrl->id =

				V4L2_CID_MPEG_VIDC_VIDEO_INITIAL_P_FRAME_QP;

			temp_ctrl->val = control[i].value;

			rc = msm_venc_validate_qp_value(inst, temp_ctrl);

			if (rc) {

				dprintk(VIDC_ERR, "Invalid Initial P QP\n");

				break;

			}

			quant.qpp = control[i].value;

			property_id = HAL_PARAM_VENC_ENABLE_INITIAL_QP;

			pdata = &quant;

			break;

		case V4L2_CID_MPEG_VIDC_VIDEO_INITIAL_B_FRAME_QP:

			temp_ctrl->id =

				V4L2_CID_MPEG_VIDC_VIDEO_INITIAL_B_FRAME_QP;

			temp_ctrl->val = control[i].value;

			rc = msm_venc_validate_qp_value(inst, temp_ctrl);

			if (rc) {

				dprintk(VIDC_ERR, "Invalid Initial B QP\n");

				break;

			}

			quant.qpb = control[i].value;

			property_id = HAL_PARAM_VENC_ENABLE_INITIAL_QP;

			pdata = &quant;

			break;

		case V4L2_CID_MPEG_VIDC_VIDEO_IFRAME_X_RANGE:

			search_range.i_frame.x_subsampled = control[i].value;

			property_id = HAL_PARAM_VENC_SEARCH_RANGE;

include/uapi/linux/v4l2-controls.h

+12 −4
Original line number Diff line number Diff line
@@ -922,9 +922,9 @@ enum v4l2_mpeg_vidc_video_mvc_layout { 
	V4L2_MPEG_VIDC_VIDEO_MVC_SEQUENTIAL = 0,

	V4L2_MPEG_VIDC_VIDEO_MVC_TOP_BOTTOM = 1

};



#define V4L2_CID_MPEG_VIDC_VIDEO_VP8_MIN_QP (V4L2_CID_MPEG_MSM_VIDC_BASE + 44)

#define V4L2_CID_MPEG_VIDC_VIDEO_VP8_MAX_QP (V4L2_CID_MPEG_MSM_VIDC_BASE + 45)



#define V4L2_CID_MPEG_VIDC_VIDEO_CONCEAL_COLOR \

		(V4L2_CID_MPEG_MSM_VIDC_BASE + 46)
@@ -964,13 +964,13 @@ enum vl42_mpeg_vidc_video_enable_initial_qp { 
	V4L2_CID_MPEG_VIDC_VIDEO_ENABLE_INITIAL_QP_BFRAME = 0x4,

};



#define V4L2_CID_MPEG_VIDC_VIDEO_I_FRAME_QP \

#define V4L2_CID_MPEG_VIDC_VIDEO_INITIAL_I_FRAME_QP \

		(V4L2_CID_MPEG_MSM_VIDC_BASE + 54)



#define V4L2_CID_MPEG_VIDC_VIDEO_P_FRAME_QP \

#define V4L2_CID_MPEG_VIDC_VIDEO_INITIAL_P_FRAME_QP \

		(V4L2_CID_MPEG_MSM_VIDC_BASE + 55)



#define V4L2_CID_MPEG_VIDC_VIDEO_B_FRAME_QP \

#define V4L2_CID_MPEG_VIDC_VIDEO_INITIAL_B_FRAME_QP \

		(V4L2_CID_MPEG_MSM_VIDC_BASE + 56)



#define V4L2_CID_MPEG_VIDC_VIDEO_IFRAME_X_RANGE \
@@ -1209,6 +1209,14 @@ enum v4l2_mpeg_vidc_video_venc_iframesize_type { 
	V4L2_CID_MPEG_VIDC_VIDEO_IFRAME_SIZE_UNLIMITED,

};



#define V4L2_CID_MPEG_VIDC_VIDEO_I_FRAME_QP \

		(V4L2_CID_MPEG_MSM_VIDC_BASE + 99)

#define V4L2_CID_MPEG_VIDC_VIDEO_P_FRAME_QP \

		(V4L2_CID_MPEG_MSM_VIDC_BASE + 100)

#define V4L2_CID_MPEG_VIDC_VIDEO_B_FRAME_QP \

		(V4L2_CID_MPEG_MSM_VIDC_BASE + 101)





/*  Camera class control IDs */



#define V4L2_CID_CAMERA_CLASS_BASE 	(V4L2_CTRL_CLASS_CAMERA | 0x900)