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

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

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index f745617aeece8867595309ef323a09a016b3d9dc..86fd90727f56dca6e595d36b297d6e085948f946 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -1405,8 +1405,12 @@ static int vidioc_enum_framesizes(struct file *file, void *priv,
 
        /* Report a continuous range */
        fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;
-       fsize->stepwise.min_width = 48;
-       fsize->stepwise.min_height = 32;
+       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;
+       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;