Merge "msm: venc: Add control to enable Native Recorder" (ced4c545) · Commits · e / devices / android_kernel_fairphone_FP4

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -932,6 +932,15 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = {
		.default_value = V4L2_MPEG_MSM_VIDC_DISABLE,
		.step = 1,
		},
		{
		.id = V4L2_CID_MPEG_VIDC_VENC_NATIVE_RECORDER,
		.name = "Enable/Disable Native Recorder",
		.type = V4L2_CTRL_TYPE_BOOLEAN,
		.minimum = V4L2_MPEG_MSM_VIDC_DISABLE,
		.maximum = V4L2_MPEG_MSM_VIDC_ENABLE,
		.default_value = V4L2_MPEG_MSM_VIDC_DISABLE,
		.step = 1,
		},
		};

		#define NUM_CTRLS ARRAY_SIZE(msm_venc_ctrls)
		@@ -1731,6 +1740,7 @@ int msm_venc_s_ctrl(struct msm_vidc_inst inst, struct v4l2_ctrl ctrl)
		case V4L2_CID_MPEG_VIDC_VIDEO_INTRA_REFRESH_RANDOM:
		case V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB:
		case V4L2_CID_MPEG_VIDC_VENC_CVP_DISABLE:
		case V4L2_CID_MPEG_VIDC_VENC_NATIVE_RECORDER:
		dprintk(VIDC_DBG, "Control set: ID : %x Val : %d\n",
		ctrl->id, ctrl->val);
		break;

+2 −0

Original line number	Diff line number	Diff line
		@@ -976,6 +976,8 @@ enum v4l2_mpeg_vidc_video_hevc_max_hier_coding_layer {

		#define V4L2_CID_MPEG_VIDC_VENC_CVP_DISABLE \
		(V4L2_CID_MPEG_MSM_VIDC_BASE + 121)
		#define V4L2_CID_MPEG_VIDC_VENC_NATIVE_RECORDER \
		(V4L2_CID_MPEG_MSM_VIDC_BASE + 122)

		/* Camera class control IDs */