Attachment #148504 for bug #179916

Lines 2692-2697 Link Here

(-)gspcav1-20071224-orig/decoder/gspcadecoder.c (+4 lines)
2692	memcpy(myframe->tmpbuffer, myframe->data, myframe->scanlength);	2692	memcpy(myframe->tmpbuffer, myframe->data, myframe->scanlength);
2693	done= yvyu_translate(myframe,bgr);	2693	done= yvyu_translate(myframe,bgr);
2694	break;	2694	break;
		2695	case YUY3:
		2696	memcpy(myframe->tmpbuffer, myframe->data + 0x20, myframe->scanlength);
		2697	done= yvyu_translate(myframe, bgr);
		2698	break;
2695	case PGBRG:	2699	case PGBRG:
2696	done = pixart_decompress(myframe);	2700	done = pixart_decompress(myframe);
2697	if (done < 0)	2701	if (done < 0)

Lines 177-182 Link Here

(-)gspcav1-20071224-orig/gspca.h (+2 lines)
177	S561, // Sunplus Compressed stream	177	S561, // Sunplus Compressed stream
178	PGBRG, // Pixart RGGB bayer	178	PGBRG, // Pixart RGGB bayer
179	YUY2, // YUYV packed	179	YUY2, // YUYV packed
		180	YUY3, // Vimicro VC0323 YUYV packed
180	PJPG, // Pixart jpeg used with PAC7311	181	PJPG, // Pixart jpeg used with PAC7311
181	JPGV, // Vimicro VC0323	182	JPGV, // Vimicro VC0323
182	};	183	};
Lines 258-263 Link Here
258	int GRed;	259	int GRed;
259	int GBlue;	260	int GBlue;
260	int GGreen;	261	int GGreen;
		262	int rotate;
261	};	263	};
262	#define MAXCOMP 4	264	#define MAXCOMP 4
263	struct dec_hufftbl;	265	struct dec_hufftbl;




/* Force image to be read in RGB instead of BGR. This option allow
* programs that expect RGB data (e.g. gqcam) to work with this driver. */
static int force_rgb = 0;
static int force_yuv = 0;
static int gamma = 3;
static int OffRed = 0;
static int OffBlue = 0;

module_param(autoexpo, int, 0644);
module_param(debug, int, 0644);
module_param(force_rgb, int, 0644);
module_param(force_yuv, int, 0644);
module_param(gamma, int, 0644);
module_param(OffRed, int, 0644);
module_param(OffBlue, int, 0644);

MODULE_PARM_DESC(debug,
		 "Debug level: 0=none, 1=init/detection, 2=warning, 3=config/control, 4=function call, 5=max");
MODULE_PARM_DESC(force_rgb, "Read RGB instead of BGR");
MODULE_PARM_DESC(force_yuv, "Force YUV decoding in VC0323");
MODULE_PARM_DESC(gamma, "gamma setting range 0 to 7 3-> gamma=1");
MODULE_PARM_DESC(OffRed, "OffRed setting range -128 to 128");
MODULE_PARM_DESC(OffBlue, "OffBlue setting range -128 to 128");

	{S561, "S561"},
	{PGBRG,"GBRG"},
	{YUY2, "YUYV"},
	{YUY3, "YUYV"},
	{PJPG, "JPEG"},
	{-1, NULL}
};

		break;
	case BRIDGE_VC0323:
		spca50x->epadr = 2;
		spca50x->cameratype = force_yuv ? YUY3 : JPGV;
		info("USB GSPCA camera found.(VC0323) ");
		memcpy(&spca50x->funct, &fvc0321,
		       sizeof (struct cam_operation));

Return to bug 179916

Lines 82-87 Link Here

(-)gspcav1-20071224-orig/gspca_core.c (-1 / +5 lines)
82	/* Force image to be read in RGB instead of BGR. This option allow	82	/* Force image to be read in RGB instead of BGR. This option allow
83	* programs that expect RGB data (e.g. gqcam) to work with this driver. */	83	* programs that expect RGB data (e.g. gqcam) to work with this driver. */
84	static int force_rgb = 0;	84	static int force_rgb = 0;
		85	static int force_yuv = 0;
85	static int gamma = 3;	86	static int gamma = 3;
86	static int OffRed = 0;	87	static int OffRed = 0;
87	static int OffBlue = 0;	88	static int OffBlue = 0;
Lines 108-113 Link Here
108	module_param(autoexpo, int, 0644);	109	module_param(autoexpo, int, 0644);
109	module_param(debug, int, 0644);	110	module_param(debug, int, 0644);
110	module_param(force_rgb, int, 0644);	111	module_param(force_rgb, int, 0644);
		112	module_param(force_yuv, int, 0644);
111	module_param(gamma, int, 0644);	113	module_param(gamma, int, 0644);
112	module_param(OffRed, int, 0644);	114	module_param(OffRed, int, 0644);
113	module_param(OffBlue, int, 0644);	115	module_param(OffBlue, int, 0644);
Lines 133-138 Link Here
133	MODULE_PARM_DESC(debug,	135	MODULE_PARM_DESC(debug,
134	"Debug level: 0=none, 1=init/detection, 2=warning, 3=config/control, 4=function call, 5=max");	136	"Debug level: 0=none, 1=init/detection, 2=warning, 3=config/control, 4=function call, 5=max");
135	MODULE_PARM_DESC(force_rgb, "Read RGB instead of BGR");	137	MODULE_PARM_DESC(force_rgb, "Read RGB instead of BGR");
		138	MODULE_PARM_DESC(force_yuv, "Force YUV decoding in VC0323");
136	MODULE_PARM_DESC(gamma, "gamma setting range 0 to 7 3-> gamma=1");	139	MODULE_PARM_DESC(gamma, "gamma setting range 0 to 7 3-> gamma=1");
137	MODULE_PARM_DESC(OffRed, "OffRed setting range -128 to 128");	140	MODULE_PARM_DESC(OffRed, "OffRed setting range -128 to 128");
138	MODULE_PARM_DESC(OffBlue, "OffBlue setting range -128 to 128");	141	MODULE_PARM_DESC(OffBlue, "OffBlue setting range -128 to 128");
Lines 190-195 Link Here
190	{S561, "S561"},	193	{S561, "S561"},
191	{PGBRG,"GBRG"},	194	{PGBRG,"GBRG"},
192	{YUY2, "YUYV"},	195	{YUY2, "YUYV"},
		196	{YUY3, "YUYV"},
193	{PJPG, "JPEG"},	197	{PJPG, "JPEG"},
194	{-1, NULL}	198	{-1, NULL}
195	};	199	};
Lines 2917-2923 Link Here
2917	break;	2921	break;
2918	case BRIDGE_VC0323:	2922	case BRIDGE_VC0323:
2919	spca50x->epadr = 2;	2923	spca50x->epadr = 2;
2920	spca50x->cameratype = JPGV;	2924	spca50x->cameratype = force_yuv ? YUY3 : JPGV;
2921	info("USB GSPCA camera found.(VC0323) ");	2925	info("USB GSPCA camera found.(VC0323) ");
2922	memcpy(&spca50x->funct, &fvc0321,	2926	memcpy(&spca50x->funct, &fvc0321,
2923	sizeof (struct cam_operation));	2927	sizeof (struct cam_operation));