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

Commit 82b12123 authored by Maheshwar Ajja's avatar Maheshwar Ajja
Browse files

msm: vidc: amend buffer counts calculation 



- Consider thumbnail mode while calculating buffer counts
- decide batching in reconfiguration event so that driver
  returns proper min buffer count when client query for it

Change-Id: I4d5373e78d43592caf0cef59f2f8801d20014efd
Signed-off-by: default avatarMaheshwar Ajja <majja@codeaurora.org>
parent b9dc8d7e

msm/vidc/msm_vdec.c

+4 −2
Original line number Diff line number Diff line
@@ -856,9 +856,11 @@ int msm_vdec_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		if (ctrl->val)

			inst->flags |= VIDC_THUMBNAIL;



		rc = msm_vidc_set_buffer_count_for_thumbnail(inst);

		rc = msm_vidc_calculate_buffer_counts(inst);

		if (rc) {

			dprintk(VIDC_ERR, "Failed to set buffer count\n");

			dprintk(VIDC_ERR,

				"%s: %x : failed to calculate thumbnail buffer count\n",

				__func__, hash32_ptr(inst->session));

			return rc;

		}

		break;

msm/vidc/msm_vidc_buffer_calculations.c

+34 −28
Original line number Diff line number Diff line
@@ -597,14 +597,25 @@ int msm_vidc_calculate_input_buffer_count(struct msm_vidc_inst *inst) 
	int extra_buff_count = 0;

	u32 input_min_count = 4;



	if (!inst) {

		dprintk(VIDC_ERR, "%s: invalid params\n", __func__);

		return -EINVAL;

	}

	fmt = &inst->fmts[INPUT_PORT];



	if (!is_decode_session(inst) && !is_encode_session(inst))

		return 0;



	if (is_thumbnail_session(inst)) {

		fmt->count_min = fmt->count_min_host = fmt->count_actual =

			MIN_NUM_THUMBNAIL_MODE_INPUT_BUFFERS;

		return 0;

	}



	/*

	 * Update input buff counts

	 * Extradata uses same count as input port

	 */

	fmt = &inst->fmts[INPUT_PORT];

	extra_buff_count = msm_vidc_get_extra_buff_count(inst,

				HAL_BUFFER_INPUT);

	fmt->count_min = input_min_count;
@@ -629,10 +640,31 @@ int msm_vidc_calculate_output_buffer_count(struct msm_vidc_inst *inst) 
	int extra_buff_count = 0;

	u32 codec, output_min_count = 4;



	if (!inst) {

		dprintk(VIDC_ERR, "%s: invalid params\n", __func__);

		return -EINVAL;

	}

	fmt = &inst->fmts[OUTPUT_PORT];

	codec = get_v4l2_codec(inst);



	if (!is_decode_session(inst) && !is_encode_session(inst))

		return 0;



	codec = get_v4l2_codec(inst);

	if (is_thumbnail_session(inst)) {

		if (codec == V4L2_PIX_FMT_VP9) {

			fmt->count_min =

				MIN_NUM_THUMBNAIL_MODE_OUTPUT_BUFFERS_VP9;

			fmt->count_min_host = fmt->count_min;

			fmt->count_actual = fmt->count_min_host;

		} else {

			fmt->count_min =

				MIN_NUM_THUMBNAIL_MODE_OUTPUT_BUFFERS;

			fmt->count_min_host = fmt->count_min;

			fmt->count_actual = fmt->count_min_host;

		}

		return 0;

	}



	/* Update output buff count: Changes for decoder based on codec */

	if (is_decode_session(inst)) {

		switch (codec) {
@@ -653,7 +685,6 @@ int msm_vidc_calculate_output_buffer_count(struct msm_vidc_inst *inst) 
			break;

		}

	}

	fmt = &inst->fmts[OUTPUT_PORT];

	extra_buff_count = msm_vidc_get_extra_buff_count(inst,

				HAL_BUFFER_OUTPUT);

	fmt->count_min = output_min_count;
@@ -681,31 +712,6 @@ int msm_vidc_calculate_buffer_counts(struct msm_vidc_inst *inst) 
	return rc;

}



u32 msm_vidc_set_buffer_count_for_thumbnail(struct msm_vidc_inst *inst)

{

	struct msm_vidc_format *fmt;



	fmt = &inst->fmts[INPUT_PORT];

	fmt->count_min = MIN_NUM_THUMBNAIL_MODE_INPUT_BUFFERS;

	fmt->count_min_host = MIN_NUM_THUMBNAIL_MODE_INPUT_BUFFERS;

	fmt->count_actual = MIN_NUM_THUMBNAIL_MODE_INPUT_BUFFERS;



	fmt = &inst->fmts[OUTPUT_PORT];

	/* VP9 super frame requires multiple frames decoding */

	if (get_v4l2_codec(inst) == V4L2_PIX_FMT_VP9) {

		fmt->count_min = MIN_NUM_THUMBNAIL_MODE_OUTPUT_BUFFERS_VP9;

		fmt->count_min_host =

			MIN_NUM_THUMBNAIL_MODE_OUTPUT_BUFFERS_VP9;

		fmt->count_actual =

			MIN_NUM_THUMBNAIL_MODE_OUTPUT_BUFFERS_VP9;

	} else {

		fmt->count_min = MIN_NUM_THUMBNAIL_MODE_OUTPUT_BUFFERS;

		fmt->count_min_host = MIN_NUM_THUMBNAIL_MODE_OUTPUT_BUFFERS;

		fmt->count_actual = MIN_NUM_THUMBNAIL_MODE_OUTPUT_BUFFERS;

	}

	return 0;

}



int msm_vidc_get_extra_buff_count(struct msm_vidc_inst *inst,

	enum hal_buffer buffer_type)

{

msm/vidc/msm_vidc_buffer_calculations.h

+0 −1
Original line number Diff line number Diff line
@@ -37,6 +37,5 @@ u32 msm_vidc_calculate_enc_input_frame_size(struct msm_vidc_inst *inst); 
u32 msm_vidc_calculate_enc_output_frame_size(struct msm_vidc_inst *inst);

u32 msm_vidc_calculate_enc_input_extra_size(struct msm_vidc_inst *inst);

u32 msm_vidc_calculate_enc_output_extra_size(struct msm_vidc_inst *inst);

u32 msm_vidc_set_buffer_count_for_thumbnail(struct msm_vidc_inst *inst);



#endif // __H_MSM_VIDC_BUFFER_MEM_DEFS_H__

msm/vidc/msm_vidc_common.c

+7 −0
Original line number Diff line number Diff line
@@ -1778,6 +1778,13 @@ static void handle_event_change(enum hal_command_response cmd, void *data) 


	if (event == V4L2_EVENT_SEQ_CHANGED_INSUFFICIENT) {

		dprintk(VIDC_HIGH, "V4L2_EVENT_SEQ_CHANGED_INSUFFICIENT\n");



		/* decide batching as configuration changed */

		if (inst->batch.enable)

			inst->batch.enable = is_batching_allowed(inst);

		dprintk(VIDC_HIGH, "%s: %x : batching %s\n",

			__func__, hash32_ptr(inst->session),

			inst->batch.enable ? "enabled" : "disabled");

	}



	rc = msm_vidc_check_session_supported(inst);