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

Commit c8be54f0 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Add support to disable CVP usage"

parents c2a85947 408a8050

msm/vidc/msm_venc.c

+3 −0
Original line number Diff line number Diff line
@@ -4201,6 +4201,9 @@ int msm_venc_set_extradata(struct msm_vidc_inst *inst) 
		}

	}



	if(!msm_vidc_cvp_usage)

		inst->prop.extradata_ctrls &= ~EXTRADATA_ENC_INPUT_CVP;



	/* CVP extradata is common between user space and external CVP kernel to kernel.

	   Hence, skipping here and will be set after msm_vidc_prepare_preprocess in start_streaming*/

msm/vidc/msm_vidc_common.c

+1 −1
Original line number Diff line number Diff line
@@ -4211,7 +4211,7 @@ static void populate_frame_data(struct vidc_frame_data *data, 
		if (vbuf->flags & V4L2_BUF_FLAG_CODECCONFIG)

			data->flags |= HAL_BUFFERFLAG_CODECCONFIG;



		if(vbuf->flags & V4L2_BUF_FLAG_CVPMETADATA_SKIP)

		if(msm_vidc_cvp_usage && (vbuf->flags & V4L2_BUF_FLAG_CVPMETADATA_SKIP))

			data->flags |= HAL_BUFFERFLAG_CVPMETADATA_SKIP;



		msm_comm_fetch_input_tag(&inst->etb_data, vb->index,