V4L/DVB (11904): zoran: Use v4l bounding/alignment functiob

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>
This commit is contained in:
Trent Piepho 2009-05-30 21:45:46 -03:00 committed by Mauro Carvalho Chehab
parent bc44fc061e
commit 728f5b93f4

View File

@ -2088,16 +2088,10 @@ static int zoran_try_fmt_vid_cap(struct file *file, void *__fh,
return -EINVAL; return -EINVAL;
} }
bpp = (zoran_formats[i].depth + 7) / 8; bpp = DIV_ROUND_UP(zoran_formats[i].depth, 8);
fmt->fmt.pix.width &= ~((bpp == 2) ? 1 : 3); v4l_bound_align_image(
if (fmt->fmt.pix.width > BUZ_MAX_WIDTH) &fmt->fmt.pix.width, BUZ_MIN_WIDTH, BUZ_MAX_WIDTH, bpp == 2 ? 1 : 2,
fmt->fmt.pix.width = BUZ_MAX_WIDTH; &fmt->fmt.pix.height, BUZ_MIN_HEIGHT, BUZ_MAX_HEIGHT, 0, 0);
if (fmt->fmt.pix.width < BUZ_MIN_WIDTH)
fmt->fmt.pix.width = BUZ_MIN_WIDTH;
if (fmt->fmt.pix.height > BUZ_MAX_HEIGHT)
fmt->fmt.pix.height = BUZ_MAX_HEIGHT;
if (fmt->fmt.pix.height < BUZ_MIN_HEIGHT)
fmt->fmt.pix.height = BUZ_MIN_HEIGHT;
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return 0; return 0;