Commit 68f194e0 authored by Daniel Ritz's avatar Daniel Ritz Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13830): uvcvideo: add another YUYV format GUID for iSight cameras 



For some unknown reason, on a MacBookPro5,3 the iSight sometimes report
a different video format GUID. This patch add the other (wrong) GUID to
the format table, making the iSight work always w/o other problems.

What it should report: 32595559-0000-0010-8000-00aa00389b71
What it often reports: 32595559-0000-0010-8000-000000389b71

Signed-off-by: default avatarDaniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 73de3592

drivers/media/video/uvc/uvc_driver.c

+5 −0
Original line number Diff line number Diff line
@@ -59,6 +59,11 @@ static struct uvc_format_desc uvc_fmts[] = { 
		.guid		= UVC_GUID_FORMAT_YUY2,

		.fcc		= V4L2_PIX_FMT_YUYV,

	},

	{

		.name		= "YUV 4:2:2 (YUYV)",

		.guid		= UVC_GUID_FORMAT_YUY2_ISIGHT,

		.fcc		= V4L2_PIX_FMT_YUYV,

	},

	{

		.name		= "YUV 4:2:0 (NV12)",

		.guid		= UVC_GUID_FORMAT_NV12,

drivers/media/video/uvc/uvcvideo.h

+3 −0
Original line number Diff line number Diff line
@@ -113,6 +113,9 @@ struct uvc_xu_control { 
#define UVC_GUID_FORMAT_YUY2 \

	{ 'Y',  'U',  'Y',  '2', 0x00, 0x00, 0x10, 0x00, \

	 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}

#define UVC_GUID_FORMAT_YUY2_ISIGHT \

	{ 'Y',  'U',  'Y',  '2', 0x00, 0x00, 0x10, 0x00, \

	 0x80, 0x00, 0x00, 0x00, 0x00, 0x38, 0x9b, 0x71}

#define UVC_GUID_FORMAT_NV12 \

	{ 'N',  'V',  '1',  '2', 0x00, 0x00, 0x10, 0x00, \

	 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}