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

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

Merge "msm: venc: do not update operating rate during INT_MAX"

parents 80b7de79 211938a6

msm/vidc/msm_venc.c

+5 −4
Original line number Diff line number Diff line
@@ -1683,6 +1683,10 @@ int msm_venc_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
	case V4L2_CID_MPEG_VIDC_VIDEO_OPERATING_RATE:

		if (!is_valid_operating_rate(inst, ctrl->val))

			break;

		inst->flags &= ~VIDC_TURBO;

		if (ctrl->val == INT_MAX)

			inst->flags |= VIDC_TURBO;

		else

			inst->clk_data.operating_rate = ctrl->val;

		/* For HEIC image encode, set operating rate to 1 */

		if (is_grid_session(inst)) {
@@ -1690,9 +1694,6 @@ int msm_venc_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
					__func__);

			inst->clk_data.operating_rate = 1 << 16;

		}

		inst->flags &= ~VIDC_TURBO;

		if (ctrl->val == INT_MAX)

			inst->flags |= VIDC_TURBO;

		if (inst->state < MSM_VIDC_LOAD_RESOURCES)

			msm_vidc_calculate_buffer_counts(inst);

		if (inst->state == MSM_VIDC_START_DONE) {