Skip to content

L
linux-davinci
Commit 4b89945e authored by Trent Piepho's avatar Trent Piepho Committed by Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (11907): cx88: Use v4l bounding/alignment function 

The v4l function has a better algorithm for aligning image size.
Signed-off-by: default avatarTrent Piepho <xyzzy@speakeasy.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent bc52d6eb
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 9 deletions
drivers/media/video/cx88/cx88-video.c
View file @ 4b89945e
...@@ -1111,15 +1111,8 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, ...@@ -1111,15 +1111,8 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
} }
f->fmt.pix.field = field; f->fmt.pix.field = field;
if (f->fmt.pix.height < 32) v4l_bound_align_image(&f->fmt.pix.width, 48, maxw, 2,
f->fmt.pix.height = 32; &f->fmt.pix.height, 32, maxh, 0, 0);
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;
f->fmt.pix.bytesperline = f->fmt.pix.bytesperline =
(f->fmt.pix.width * fmt->depth) >> 3; (f->fmt.pix.width * fmt->depth) >> 3;
f->fmt.pix.sizeimage = f->fmt.pix.sizeimage =
......
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