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

Commit 26d7d0a3 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge f4ebe15f on remote branch 

Change-Id: I7b3dbb2bcc996c2a80ef21a2caff7267edf971f6
parents aad9325c f4ebe15f

msm/vidc/msm_venc.c

+7 −0
Original line number Diff line number Diff line
@@ -4628,6 +4628,13 @@ int handle_all_intra_restrictions(struct msm_vidc_inst *inst) 
	fps_max = capability->cap[CAP_ALLINTRA_MAX_FPS].max;

	s_vpr_h(inst->sid, "%s: rc_type %u, fps %u, fps_max %u\n",

		__func__, inst->rc_type, n_fps, fps_max);

	if (inst->all_intra && n_fps > fps_max) {

		inst->clk_data.frame_rate = fps_max << 16;

		n_fps = fps_max;

		s_vpr_h(inst->sid,

			"%s:cap2 frame rate to %u for allintra encoding",

			__func__, inst->clk_data.frame_rate >> 16);

	}

	if ((inst->rc_type != V4L2_MPEG_VIDEO_BITRATE_MODE_VBR &&

		inst->rc_type != RATE_CONTROL_OFF &&

		inst->rc_type != RATE_CONTROL_LOSSLESS) ||

msm/vidc/msm_vidc_common.c

+1 −1
Original line number Diff line number Diff line
@@ -5818,7 +5818,7 @@ static int msm_vidc_check_mbpf_supported(struct msm_vidc_inst *inst) 


	if (mbpf > core->resources.max_mbpf) {

		msm_vidc_print_running_insts(inst->core);

		return -ENOMEM;

		return -EBUSY;

	}



	return 0;