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

Commit 3e71da19 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

[media] saa7134: Fix bytesperline not being set correctly for planar formats 

bytesperline should be the bytesperline for the first plane for planar
formats, not that of all planes combined.

This fixes a crash in xawtv caused by the wrong bpl.

BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1305389


Reported-and-tested-by: default avatarStas Sergeev <stsp@list.ru>

Cc: stable@vger.kernel.org
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 83446227

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

+12 −6
Original line number Diff line number Diff line
@@ -1279,10 +1279,13 @@ static int saa7134_g_fmt_vid_cap(struct file *file, void *priv, 
	f->fmt.pix.height       = dev->height;

	f->fmt.pix.field        = dev->field;

	f->fmt.pix.pixelformat  = dev->fmt->fourcc;

	if (dev->fmt->planar)

		f->fmt.pix.bytesperline = f->fmt.pix.width;

	else

		f->fmt.pix.bytesperline =

		(f->fmt.pix.width * dev->fmt->depth) >> 3;

			(f->fmt.pix.width * dev->fmt->depth) / 8;

	f->fmt.pix.sizeimage =

		f->fmt.pix.height * f->fmt.pix.bytesperline;

		(f->fmt.pix.height * f->fmt.pix.width * dev->fmt->depth) / 8;

	f->fmt.pix.colorspace   = V4L2_COLORSPACE_SMPTE170M;

	return 0;

}
@@ -1358,10 +1361,13 @@ static int saa7134_try_fmt_vid_cap(struct file *file, void *priv, 
	if (f->fmt.pix.height > maxh)

		f->fmt.pix.height = maxh;

	f->fmt.pix.width &= ~0x03;

	if (fmt->planar)

		f->fmt.pix.bytesperline = f->fmt.pix.width;

	else

		f->fmt.pix.bytesperline =

		(f->fmt.pix.width * fmt->depth) >> 3;

			(f->fmt.pix.width * fmt->depth) / 8;

	f->fmt.pix.sizeimage =

		f->fmt.pix.height * f->fmt.pix.bytesperline;

		(f->fmt.pix.height * f->fmt.pix.width * fmt->depth) / 8;

	f->fmt.pix.colorspace   = V4L2_COLORSPACE_SMPTE170M;



	return 0;