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

Unverified Commit 546c833a authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.14.r1-22900.01-LAHAINA.QSSI14.0' of... 

Merge tag 'LA.UM.9.14.r1-22900.01-LAHAINA.QSSI14.0' of https://git.codelinaro.org/clo/la/platform/vendor/opensource/video-driver into android13-5.4-lahaina

"LA.UM.9.14.r1-22900.01-LAHAINA.QSSI14.0"

* tag 'LA.UM.9.14.r1-22900.01-LAHAINA.QSSI14.0' of https://git.codelinaro.org/clo/la/platform/vendor/opensource/video-driver:
  msm: vidc: fix tier and level issue for hevc

Change-Id: I83af5b7733d8bbe6eca2bbcff73968593c1848db
parents 187f7147 429c4b42

techpack/video/msm/vidc/msm_venc.c

+8 −2
Original line number Diff line number Diff line
@@ -1587,7 +1587,7 @@ static int msm_venc_update_bitrate(struct msm_vidc_inst *inst) 


int msm_venc_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl)

{

	int rc = 0;

	int rc = 0, hevc_tier_value = 0;

	struct msm_vidc_mastering_display_colour_sei_payload *mdisp_sei = NULL;

	struct msm_vidc_content_light_level_sei_payload *cll_sei = NULL;

	u32 i_qp_min, i_qp_max, p_qp_min, p_qp_max, b_qp_min, b_qp_max;
@@ -1816,7 +1816,13 @@ int msm_venc_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		break;

	case V4L2_CID_MPEG_VIDEO_H264_LEVEL:

	case V4L2_CID_MPEG_VIDEO_HEVC_LEVEL:

		if ((inst->level & 0xf0000000) && get_v4l2_codec(inst) == V4L2_PIX_FMT_HEVC) {

			hevc_tier_value = (inst->level & 0xf0000000);

			inst->level = msm_comm_v4l2_to_hfi(ctrl->id, ctrl->val, sid) | hevc_tier_value;

		}

		else {

			inst->level = msm_comm_v4l2_to_hfi(ctrl->id, ctrl->val, sid);

		}

		break;

	case V4L2_CID_MPEG_VIDEO_HEVC_TIER:

		inst->level |=