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

Commit 98ab1c99 authored by Krzysztof Hałasa's avatar Krzysztof Hałasa Committed by Greg Kroah-Hartman
Browse files

staging: Solo6x10: accept WxH >= screen dimentions. 



This makes it possible to request full resolution (704x576 or 704x480)
independently of the color system used (PAL or NTSC).

Signed-off-by: default avatarKrzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 97a6688a

drivers/staging/solo6x10/solo6010-v4l2-enc.c

+8 −4
Original line number Diff line number Diff line
@@ -1034,13 +1034,17 @@ static int solo_enc_try_fmt_cap(struct file *file, void *priv, 
		if (pix->width != solo_enc->width ||

		    pix->height != solo_enc->height)

			return -EBUSY;

	} else if (!(pix->width == solo_dev->video_hsize &&

	      pix->height == solo_dev->video_vsize << 1) &&

	    !(pix->width == solo_dev->video_hsize >> 1 &&

	      pix->height == solo_dev->video_vsize)) {

	}



	if (pix->width < solo_dev->video_hsize ||

	    pix->height < solo_dev->video_vsize << 1) {

		/* Default to CIF 1/2 size */

		pix->width = solo_dev->video_hsize >> 1;

		pix->height = solo_dev->video_vsize;

	} else {

		/* Full frame */

		pix->width = solo_dev->video_hsize;

		pix->height = solo_dev->video_vsize << 1;

	}



	if (pix->field == V4L2_FIELD_ANY)