Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc52d6eb authored by Trent Piepho's avatar Trent Piepho Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (11906): saa7134: 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 3adbbb8e

drivers/media/video/saa7134/saa7134-video.c

+2 −9
Original line number Diff line number Diff line
@@ -1640,15 +1640,8 @@ static int saa7134_try_fmt_vid_cap(struct file *file, void *priv, 
	}



	f->fmt.pix.field = field;

	if (f->fmt.pix.width  < 48)

		f->fmt.pix.width  = 48;

	if (f->fmt.pix.height < 32)

		f->fmt.pix.height = 32;

	if (f->fmt.pix.width > maxw)

		f->fmt.pix.width = maxw;

	if (f->fmt.pix.height > maxh)

		f->fmt.pix.height = maxh;

	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 =