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

Commit 5b4741c8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: skip fps round off when client sets 1 fps"

parents f2e25827 56002623

drivers/media/platform/msm/vidc/msm_vidc_common.c

+9 −3
Original line number Diff line number Diff line
@@ -301,8 +301,14 @@ int msm_comm_get_inst_load(struct msm_vidc_inst *inst, 
	 */



	if (is_non_realtime_session(inst) &&

		(quirks & LOAD_CALC_IGNORE_NON_REALTIME_LOAD))

		(quirks & LOAD_CALC_IGNORE_NON_REALTIME_LOAD)) {

		if (!inst->prop.fps) {

			dprintk(VIDC_INFO, "instance:%p fps = 0\n", inst);

			load = 0;

		} else {

			load = msm_comm_get_mbs_per_sec(inst) / inst->prop.fps;

		}

	}



exit:

	mutex_unlock(&inst->lock);
@@ -5023,7 +5029,7 @@ int msm_vidc_comm_s_parm(struct msm_vidc_inst *inst, struct v4l2_streamparm *a) 


	if (fps % 15 == 14 || fps % 24 == 23)

		fps = fps + 1;

	else if (fps % 24 == 1 || fps % 15 == 1)

	else if ((fps > 1) && (fps % 24 == 1 || fps % 15 == 1))

		fps = fps - 1;



	if (inst->prop.fps != fps) {