commit 4f1dbc0d48299f0765f79742b4fe652d0e33bf96
author Linux Build Service Account <lnxbuild@quicinc.com> Mon May 08 13:12:12 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon May 08 13:12:12 2017 -0700
tree f3671fc14d2ff40e43fc9565806c24c92ee3f214
parent 9aed5b05debc9640b7e6220cb0e581d68a451d80
parent 0f7cf2e060fd1df63f763b98950a79107720d799

Merge "msm: vidc: Implement set property for framerate based rc" into msm-4.9

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

diff --git a/drivers/media/platform/msm/vidc/msm_venc.c b/drivers/media/platform/msm/vidc/msm_venc.c
index c0b6683..598d563 100644
--- a/drivers/media/platform/msm/vidc/msm_venc.c
+++ b/drivers/media/platform/msm/vidc/msm_venc.c
@@ -988,6 +988,15 @@
 			(1 << V4L2_CID_MPEG_VIDC_VIDEO_IFRAME_SIZE_UNLIMITED)),
 		.qmenu = iframe_sizes,
 	},
+	{
+		.id = V4L2_CID_MPEG_VIDEO_FRAME_RC_ENABLE,
+		.name = "Frame Rate based Rate Control",
+		.type = V4L2_CTRL_TYPE_BOOLEAN,
+		.minimum = 0,
+		.maximum = 1,
+		.default_value = 0,
+		.step = 1,
+	},
 
 };
 
@@ -1849,6 +1858,13 @@
 				ctrl->val);
 		pdata = &iframesize_type;
 		break;
+	case V4L2_CID_MPEG_VIDEO_FRAME_RC_ENABLE:
+	{
+		property_id = HAL_PARAM_VENC_DISABLE_RC_TIMESTAMP;
+		enable.enable = ctrl->val;
+		pdata = &enable;
+		break;
+	}
 	default:
 		dprintk(VIDC_ERR, "Unsupported index: %x\n", ctrl->id);
 		rc = -ENOTSUPP;