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

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

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



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 bc44fc06

drivers/media/video/zoran/zoran_driver.c

+4 −10
Original line number Diff line number Diff line
@@ -2088,16 +2088,10 @@ static int zoran_try_fmt_vid_cap(struct file *file, void *__fh, 
		return -EINVAL;

	}



	bpp = (zoran_formats[i].depth + 7) / 8;

	fmt->fmt.pix.width &= ~((bpp == 2) ? 1 : 3);

	if (fmt->fmt.pix.width > BUZ_MAX_WIDTH)

		fmt->fmt.pix.width = BUZ_MAX_WIDTH;

	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;

	bpp = DIV_ROUND_UP(zoran_formats[i].depth, 8);

	v4l_bound_align_image(

		&fmt->fmt.pix.width, BUZ_MIN_WIDTH, BUZ_MAX_WIDTH, bpp == 2 ? 1 : 2,

		&fmt->fmt.pix.height, BUZ_MIN_HEIGHT, BUZ_MAX_HEIGHT, 0, 0);

	mutex_unlock(&zr->resource_lock);



	return 0;