Merge "msm: vidc: Remove enabling CVP extradata by default" (04415e1e) · Commits · e / devices / android_kernel_fairphone_FP4

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

+11 −5

Original line number	Diff line number	Diff line
		@@ -3229,6 +3229,7 @@ int msm_venc_set_extradata(struct msm_vidc_inst *inst)
		int rc = 0;
		struct v4l2_ctrl *ctrl;
		struct v4l2_ctrl *cvp_ctrl;
		u32 value = 0x0;

		ctrl = get_ctrl(inst, V4L2_CID_MPEG_VIDC_VIDEO_EXTRADATA);
		if (ctrl->val == EXTRADATA_NONE) {
		@@ -3272,13 +3273,18 @@ int msm_venc_set_extradata(struct msm_vidc_inst *inst)
		"%s: invalid params\n", __func__);
		return -EINVAL;
		}

		rc = msm_comm_set_extradata(inst,
		HFI_PROPERTY_PARAM_VENC_CVP_METADATA_EXTRADATA, 0x0);
		} else {
		rc = msm_comm_set_extradata(inst,
		HFI_PROPERTY_PARAM_VENC_CVP_METADATA_EXTRADATA, 0x1);
		/*
		* For now, enable CVP metadata only if client provides it.
		* Once the kernel-mode CVP metadata implementation
		* is completed, this condition should be removed.
		*/
		if (ctrl->val & EXTRADATA_ENC_INPUT_CVP)
		value = 0x1;

		}
		rc = msm_comm_set_extradata(inst,
		HFI_PROPERTY_PARAM_VENC_CVP_METADATA_EXTRADATA, value);

		return rc;
		}