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

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
......@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment