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

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

Merge "msm: vidc: Update num_ref calc and limit max_layer"

parents 3cd260e6 5bf834b7

msm/vidc/msm_venc.c

+6 −0
Original line number Diff line number Diff line
@@ -3810,6 +3810,12 @@ int msm_venc_set_hp_max_layer(struct msm_vidc_inst *inst) 
			__func__);

		return rc;

	}

	if (!inst->hybrid_hp && max_layer->val > 4) {

		update_ctrl(max_layer, 0, inst->sid);

		s_vpr_h(inst->sid,

			"%s: Hier-P requested beyond max capability\n", __func__);

		return 0;

	}



	/*

	 * We send enhancement layer count to FW,

msm/vidc/msm_vidc_buffer_calculations.c

+4 −4
Original line number Diff line number Diff line
@@ -497,13 +497,13 @@ int msm_vidc_get_num_ref_frames(struct msm_vidc_inst *inst) 
		codec = get_v4l2_codec(inst);

		/* LTR and B - frame not supported with hybrid HP */

		if (inst->hybrid_hp)

			num_ref = (max_layer->val - 1);

			num_ref = max_layer->val >> 1;

		else if (codec == V4L2_PIX_FMT_HEVC)

			num_ref = ((max_layer->val + 1) / 2) + ltr_count;

		else if ((codec == V4L2_PIX_FMT_H264) && (max_layer->val <= 4))

			num_ref = ((1 << (max_layer->val - 1)) - 1) + ltr_count;

		else if ((codec == V4L2_PIX_FMT_H264) && (max_layer->val < 4))

			num_ref = (max_layer->val - 1) + ltr_count;

		else

			num_ref = ((max_layer->val + 1) / 2) + ltr_count;

			num_ref = max_layer->val + ltr_count;

	}



	if (is_hier_b_session(inst)) {