Merge "msm: vidc: Fix downscaling support check" (ad63949d) · Commits · e / devices / android_kernel_xiaomi_markw

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -4535,14 +4535,14 @@ int msm_vidc_check_scaling_supported(struct msm_vidc_inst *inst)
		y_max = inst->capability.scale_y.max >> 16;

		if (input_height > output_height) {
		if (input_height/output_height > x_min) {
		if (input_height > x_min * output_height) {
		dprintk(VIDC_ERR,
		"Unsupported height downscale ratio %d vs %d\n",
		input_height/output_height, x_min);
		return -ENOTSUPP;
		}
		} else {
		if (input_height/output_height > x_max) {
		if (output_height > x_max * input_height) {
		dprintk(VIDC_ERR,
		"Unsupported height upscale ratio %d vs %d\n",
		input_height/output_height, x_max);
		@@ -4550,14 +4550,14 @@ int msm_vidc_check_scaling_supported(struct msm_vidc_inst *inst)
		}
		}
		if (input_width > output_width) {
		if (input_width/output_width > y_min) {
		if (input_width > y_min * output_width) {
		dprintk(VIDC_ERR,
		"Unsupported width downscale ratio %d vs %d\n",
		input_width/output_width, y_min);
		return -ENOTSUPP;
		}
		} else {
		if (input_width/output_width > y_max) {
		if (output_width > y_max * input_width) {
		dprintk(VIDC_ERR,
		"Unsupported width upscale ratio %d vs %d\n",
		input_width/output_width, y_max);