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

Unverified Commit 58a19075 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.12.r1-17400-SMxx50.QSSI13.0' of... 

Merge tag 'LA.UM.9.12.r1-17400-SMxx50.QSSI13.0' of https://git.codelinaro.org/clo/la/platform/vendor/opensource/video-driver into android13-4.19-kona

"LA.UM.9.12.r1-17400-SMxx50.QSSI13.0"

* tag 'LA.UM.9.12.r1-17400-SMxx50.QSSI13.0' of https://git.codelinaro.org/clo/la/platform/vendor/opensource/video-driver:
  msm : Cap framerate for all Intra setting
  msm : Cap framerate for all Intra setting
  video: driver: Return proper error code
  video: driver: Return proper error code

Change-Id: I6a750e08cd103f054a993ff8cc3eb147f2beafa6
parents 562179ef c66dd9ba

techpack/video/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) ||

techpack/video/msm/vidc/msm_vidc_common.c

+3 −3
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 -EBUSY;

		return -ENOMEM;

	}



	return 0;
@@ -5915,7 +5915,7 @@ int msm_comm_check_memory_supported(struct msm_vidc_inst *vidc_inst) 
			"%s: video mem overshoot - reached %llu MB, max_limit %llu MB\n",

			__func__, total_mem_size >> 20, memory_limit_mbytes);

		msm_comm_print_insts_info(core);

		return -EBUSY;

		return -ENOMEM;

	}



	if (!is_secure_session(vidc_inst)) {
@@ -5930,7 +5930,7 @@ int msm_comm_check_memory_supported(struct msm_vidc_inst *vidc_inst) 
				"%s: insufficient device addr space, required %llu, available %llu\n",

				__func__, non_sec_mem_size, non_sec_cb_size);

			msm_comm_print_insts_info(core);

			return -EINVAL;

			return -ENOMEM;

		}

	}