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

Commit 43513444 authored by Vaibhav Deshu Venkatesh's avatar Vaibhav Deshu Venkatesh Committed by Gerrit - the friendly Code Review server
Browse files

msm: vidc: Change platform to enable internal size calculation 



Currently for internal size calculation is disabled by using
AR50 as platform type. Change this to IRIS2. However, we still
want to disable this feature hence don't call this function
for both encoder and decoder.

Change-Id: I70b589c88c80b6263fbdeca8d0975d6eea1e8ae1
Signed-off-by: default avatarVaibhav Deshu Venkatesh <vdeshuve@codeaurora.org>
parent 13371263

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

+1 −1
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ int msm_vdec_inst_init(struct msm_vidc_inst *inst) 
	inst->buff_req.buffer[11].buffer_type = HAL_BUFFER_INTERNAL_PERSIST_1;

	inst->buff_req.buffer[12].buffer_type = HAL_BUFFER_INTERNAL_CMD_QUEUE;

	inst->buff_req.buffer[13].buffer_type = HAL_BUFFER_INTERNAL_RECON;

	msm_vidc_init_buffer_size_calculators(inst);

	inst->buffer_size_calculators = NULL;



	/* By default, initialize OUTPUT port to H264 decoder */

	fmt = msm_comm_get_pixel_fmt_fourcc(vdec_formats,

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

+1 −1
Original line number Diff line number Diff line
@@ -1086,7 +1086,7 @@ int msm_venc_inst_init(struct msm_vidc_inst *inst) 
	inst->buff_req.buffer[11].buffer_type = HAL_BUFFER_INTERNAL_PERSIST_1;

	inst->buff_req.buffer[12].buffer_type = HAL_BUFFER_INTERNAL_CMD_QUEUE;

	inst->buff_req.buffer[13].buffer_type = HAL_BUFFER_INTERNAL_RECON;

	msm_vidc_init_buffer_size_calculators(inst);

	inst->buffer_size_calculators = NULL;



	buff_req_buffer = get_buff_req_buffer(inst,

		HAL_BUFFER_EXTRADATA_INPUT);

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

+1 −1
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ void msm_vidc_init_buffer_size_calculators(struct msm_vidc_inst *inst) 
	core = inst->core;



	/* Change this to IRIS2 when ready */

	if (core->platform_data->vpu_ver == VPU_VERSION_AR50)

	if (core->platform_data->vpu_ver == VPU_VERSION_IRIS2)

		inst->buffer_size_calculators =

			msm_vidc_calculate_internal_buffer_sizes;

}