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

Commit 6beca425 authored by Vaibhav Deshu Venkatesh's avatar Vaibhav Deshu Venkatesh
Browse files

msm: vidc: Check width/height limits for downscaling 



Function that does scaling related checks is not being
called currently. Also, made changes in logs to give more
information about failure.

CRs-Fixed: 2062059
Change-Id: Ibec66a9c6f814420c68deb850e03f289d1ca400f
Signed-off-by: default avatarVaibhav Deshu Venkatesh <vdeshuve@codeaurora.org>
parent 9f28bf89

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

+12 −8
Original line number Diff line number Diff line
@@ -5117,30 +5117,30 @@ int msm_vidc_check_scaling_supported(struct msm_vidc_inst *inst) 
	if (input_height > output_height) {

		if (input_height > x_min * output_height) {

			dprintk(VIDC_ERR,

				"Unsupported height downscale ratio %d vs %d\n",

				input_height/output_height, x_min);

				"Unsupported height min height %d vs %d\n",

				input_height / x_min, output_height);

			return -ENOTSUPP;

		}

	} else {

		if (output_height > x_max * input_height) {

			dprintk(VIDC_ERR,

				"Unsupported height upscale ratio %d vs %d\n",

				input_height/output_height, x_max);

				"Unsupported height max height %d vs %d\n",

				x_max * input_height, output_height);

			return -ENOTSUPP;

		}

	}

	if (input_width > output_width) {

		if (input_width > y_min * output_width) {

			dprintk(VIDC_ERR,

				"Unsupported width downscale ratio %d vs %d\n",

				input_width/output_width, y_min);

				"Unsupported width min width %d vs %d\n",

				input_width / y_min, output_width);

			return -ENOTSUPP;

		}

	} else {

		if (output_width > y_max * input_width) {

			dprintk(VIDC_ERR,

				"Unsupported width upscale ratio %d vs %d\n",

				input_width/output_width, y_max);

				"Unsupported width max width %d vs %d\n",

				y_max * input_width, output_width);

			return -ENOTSUPP;

		}

	}
@@ -5207,6 +5207,10 @@ int msm_vidc_check_session_supported(struct msm_vidc_inst *inst) 
			capability->width.max, capability->height.max);

			rc = -ENOTSUPP;

		}



		if (!rc && msm_vidc_check_scaling_supported(inst)) {

			rc = -ENOTSUPP;

		}

	}

	if (rc) {

		change_inst_state(inst, MSM_VIDC_CORE_INVALID);