Merge "msm: vidc: support ROI map type query" (fb49e0af) · Commits · e / devices / android_kernel_fairphone_FP4

msm/vidc/msm_venc.c

+20 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,12 @@ static const char *const mpeg_video_stream_format[] = {
		NULL
		};

		static const char *const roi_map_type[] = {
		"None",
		"2-bit",
		"2-bit",
		};

		static struct msm_vidc_ctrl msm_venc_ctrls[] = {
		{
		.id = V4L2_CID_MPEG_VIDEO_UNKNOWN,
		@@ -974,6 +980,20 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = {
		.default_value = (DEFAULT_FPS << 16),
		.step = 1,
		},
		{
		.id = V4L2_CID_MPEG_VIDC_VIDEO_ROI_TYPE,
		.name = "ROI Type",
		.type = V4L2_CTRL_TYPE_MENU,
		.minimum = V4L2_CID_MPEG_VIDC_VIDEO_ROI_TYPE_NONE,
		.maximum = V4L2_CID_MPEG_VIDC_VIDEO_ROI_TYPE_2BYTE,
		.default_value = V4L2_CID_MPEG_VIDC_VIDEO_ROI_TYPE_NONE,
		.menu_skip_mask = ~(
		(1 << V4L2_CID_MPEG_VIDC_VIDEO_ROI_TYPE_NONE) \|
		(1 << V4L2_CID_MPEG_VIDC_VIDEO_ROI_TYPE_2BIT) \|
		(1 << V4L2_CID_MPEG_VIDC_VIDEO_ROI_TYPE_2BYTE)
		),
		.qmenu = roi_map_type,
		},
		};

		#define NUM_CTRLS ARRAY_SIZE(msm_venc_ctrls)

+13 −0

Original line number	Diff line number	Diff line
		@@ -1519,6 +1519,19 @@ static int try_get_ctrl_for_instance(struct msm_vidc_inst *inst,
		case V4L2_CID_MPEG_VIDC_VIDEO_EXTRADATA:
		ctrl->val = inst->prop.extradata_ctrls;
		break;
		case V4L2_CID_MPEG_VIDC_VIDEO_ROI_TYPE:
		{
		uint32_t vpu_ver;

		if (!inst->core \|\| !inst->core->platform_data)
		return -EINVAL;
		vpu_ver = inst->core->platform_data->vpu_ver;
		ctrl->val = (vpu_ver == VPU_VERSION_IRIS1 \|\|
		vpu_ver == VPU_VERSION_IRIS2) ?
		V4L2_CID_MPEG_VIDC_VIDEO_ROI_TYPE_2BYTE :
		V4L2_CID_MPEG_VIDC_VIDEO_ROI_TYPE_2BIT;
		break;
		}
		default:
		break;
		}