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

Commit 6c3598e6 authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab
Browse files

[media] em28xx: VIDIOC_ENUM_FRAMESIZES: consider the scaler limits when... 


[media] em28xx: VIDIOC_ENUM_FRAMESIZES: consider the scaler limits when calculating the minimum frame size

Output resolutions <=20% of the input resolution exceed the capabilities of the
scaler.

Signed-off-by: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b8374138

drivers/media/usb/em28xx/em28xx-video.c

+6 −2
Original line number Diff line number Diff line
@@ -1405,8 +1405,12 @@ static int vidioc_enum_framesizes(struct file *file, void *priv, 


	/* Report a continuous range */

	fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;

	scale_to_size(dev, EM28XX_HVSCALE_MAX, EM28XX_HVSCALE_MAX,

		      &fsize->stepwise.min_width, &fsize->stepwise.min_height);

	if (fsize->stepwise.min_width < 48)

		fsize->stepwise.min_width = 48;

	fsize->stepwise.min_height = 32;

	if (fsize->stepwise.min_height < 38)

		fsize->stepwise.min_height = 38;

	fsize->stepwise.max_width = maxw;

	fsize->stepwise.max_height = maxh;

	fsize->stepwise.step_width = 1;