diff options
| author | Trent Piepho <xyzzy@speakeasy.org> | 2009-05-30 21:45:46 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-23 03:21:18 -0300 |
| commit | 3adbbb8e2a87d58401466c825e9ff191e3b5a7b6 (patch) | |
| tree | 1039ab75a8f84b50e6ffd92a9bfc6b1cd7c7402d | |
| parent | 728f5b93f48cbfebd8e939bec2be1252fce7dae1 (diff) | |
| download | linux-3.10-3adbbb8e2a87d58401466c825e9ff191e3b5a7b6.tar.gz linux-3.10-3adbbb8e2a87d58401466c825e9ff191e3b5a7b6.tar.bz2 linux-3.10-3adbbb8e2a87d58401466c825e9ff191e3b5a7b6.zip | |
V4L/DVB (11905): vivi: Use v4l bounding/alignment function
The v4l function has a better algorithm for aligning image size.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/video/vivi.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index fbfefae7886..cd726685846 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c @@ -883,15 +883,8 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, maxh = norm_maxh(); f->fmt.pix.field = field; - if (f->fmt.pix.height < 32) - f->fmt.pix.height = 32; - if (f->fmt.pix.height > maxh) - f->fmt.pix.height = maxh; - if (f->fmt.pix.width < 48) - f->fmt.pix.width = 48; - if (f->fmt.pix.width > maxw) - f->fmt.pix.width = maxw; - f->fmt.pix.width &= ~0x03; + v4l_bound_align_image(&f->fmt.pix.width, 48, maxw, 2, + &f->fmt.pix.height, 32, maxh, 0, 0); f->fmt.pix.bytesperline = (f->fmt.pix.width * fmt->depth) >> 3; f->fmt.pix.sizeimage = |