dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

staging: Solo6x10: accept WxH >= screen dimentions.

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

Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Krzysztof Hałasa 2011-02-11 13:10:30 +01:00 committed by Greg Kroah-Hartman
parent 97a6688aa2
commit 98ab1c9978
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/staging/solo6x10/solo6010-v4l2-enc.c
View file

@ -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)