Commit 7103180b authored Jul 05, 2012 by Laurent Pinchart Committed by Mauro Carvalho Chehab Jul 06, 2012

[media] omap3isp: preview: Fix output size computation depending on input format



The preview engine crops 4 columns and 4 lines when CFA is enabled.
Commit b2da46e5 ("omap3isp: preview: Add
support for greyscale input") inverted the condition by mistake, fix
this.

Reported-by: Florian Neuhaus <florian.neuhaus@reberinformatik.ch>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Florian Neuhaus <florian.neuhaus@reberinformatik.ch>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 8299d628

drivers/media/video/omap3isp/isppreview.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1102,7 +1102,7 @@ static void preview_config_input_size(struct isp_prev_device *prev, u32 active)
	unsigned int elv = prev->crop.top + prev->crop.height - 1;		unsigned int elv = prev->crop.top + prev->crop.height - 1;
	u32 features;		u32 features;

	if (format->code == V4L2_MBUS_FMT_Y10_1X10) {		if (format->code != V4L2_MBUS_FMT_Y10_1X10) {
	sph -= 2;		sph -= 2;
	eph += 2;		eph += 2;
	slv -= 2;		slv -= 2;