Commit 2c4e776a authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

[media] gspca_xirlink_cit: Frames have a 4 byte footer 



At least on the ibm netcam pro frames have a 4 byte footer, take this
into account when calculating sizeimage.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent bc46bae6

drivers/media/video/gspca/xirlink_cit.c

+12 −12
Original line number Diff line number Diff line
@@ -185,60 +185,60 @@ static const struct ctrl sd_ctrls[] = { 
static const struct v4l2_pix_format cif_yuv_mode[] = {

	{176, 144, V4L2_PIX_FMT_CIT_YYVYUY, V4L2_FIELD_NONE,

		.bytesperline = 176,

		.sizeimage = 176 * 144 * 3 / 2,

		.sizeimage = 176 * 144 * 3 / 2 + 4,

		.colorspace = V4L2_COLORSPACE_SRGB},

	{352, 288, V4L2_PIX_FMT_CIT_YYVYUY, V4L2_FIELD_NONE,

		.bytesperline = 352,

		.sizeimage = 352 * 288 * 3 / 2,

		.sizeimage = 352 * 288 * 3 / 2 + 4,

		.colorspace = V4L2_COLORSPACE_SRGB},

};



static const struct v4l2_pix_format vga_yuv_mode[] = {

	{160, 120, V4L2_PIX_FMT_CIT_YYVYUY, V4L2_FIELD_NONE,

		.bytesperline = 160,

		.sizeimage = 160 * 120 * 3 / 2,

		.sizeimage = 160 * 120 * 3 / 2 + 4,

		.colorspace = V4L2_COLORSPACE_SRGB},

	{320, 240, V4L2_PIX_FMT_CIT_YYVYUY, V4L2_FIELD_NONE,

		.bytesperline = 320,

		.sizeimage = 320 * 240 * 3 / 2,

		.sizeimage = 320 * 240 * 3 / 2 + 4,

		.colorspace = V4L2_COLORSPACE_SRGB},

	{640, 480, V4L2_PIX_FMT_CIT_YYVYUY, V4L2_FIELD_NONE,

		.bytesperline = 640,

		.sizeimage = 640 * 480 * 3 / 2,

		.sizeimage = 640 * 480 * 3 / 2 + 4,

		.colorspace = V4L2_COLORSPACE_SRGB},

};



static const struct v4l2_pix_format model0_mode[] = {

	{160, 120, V4L2_PIX_FMT_CIT_YYVYUY, V4L2_FIELD_NONE,

		.bytesperline = 160,

		.sizeimage = 160 * 120 * 3 / 2,

		.sizeimage = 160 * 120 * 3 / 2 + 4,

		.colorspace = V4L2_COLORSPACE_SRGB},

	{176, 144, V4L2_PIX_FMT_CIT_YYVYUY, V4L2_FIELD_NONE,

		.bytesperline = 176,

		.sizeimage = 176 * 144 * 3 / 2,

		.sizeimage = 176 * 144 * 3 / 2 + 4,

		.colorspace = V4L2_COLORSPACE_SRGB},

	{320, 240, V4L2_PIX_FMT_CIT_YYVYUY, V4L2_FIELD_NONE,

		.bytesperline = 320,

		.sizeimage = 320 * 240 * 3 / 2,

		.sizeimage = 320 * 240 * 3 / 2 + 4,

		.colorspace = V4L2_COLORSPACE_SRGB},

};



static const struct v4l2_pix_format model2_mode[] = {

	{160, 120, V4L2_PIX_FMT_CIT_YYVYUY, V4L2_FIELD_NONE,

		.bytesperline = 160,

		.sizeimage = 160 * 120 * 3 / 2,

		.sizeimage = 160 * 120 * 3 / 2 + 4,

		.colorspace = V4L2_COLORSPACE_SRGB},

	{176, 144, V4L2_PIX_FMT_CIT_YYVYUY, V4L2_FIELD_NONE,

		.bytesperline = 176,

		.sizeimage = 176 * 144 * 3 / 2,

		.sizeimage = 176 * 144 * 3 / 2 + 4,

		.colorspace = V4L2_COLORSPACE_SRGB},

	{320, 240, V4L2_PIX_FMT_SGRBG8, V4L2_FIELD_NONE,

		.bytesperline = 320,

		.sizeimage = 320 * 240,

		.sizeimage = 320 * 240 + 4,

		.colorspace = V4L2_COLORSPACE_SRGB},

	{352, 288, V4L2_PIX_FMT_SGRBG8, V4L2_FIELD_NONE,

		.bytesperline = 352,

		.sizeimage = 352 * 288,

		.sizeimage = 352 * 288 + 4,

		.colorspace = V4L2_COLORSPACE_SRGB},

};