Attachment #246795 for bug #336599




		
int spcaClient (char *Ip, short port,int owidth, int oheight ,int statOn);
int spcaPlay (char* inputfile, int width, int height);
int spcaGrab (char *outputfile,char (*fourcc)[8] , const char *videodevice, int image_width,int image_height, int format, int owidth, int oheight,
	int grabMethod,int videoOn,int audioout,int videocomp,int autobright,int statOn,int decodeOn);
	
void *waitandshoot(void* ptr)

	/*        avi parametres          */
	char *inputfile = NULL;
	char *outputfile = NULL;
	char fourcc[8] = "MJPG";
	
	char *sizestring = NULL;
	int use_libjpeg = 1;

	case GRABBER:
	{
		/* spcaview grabber */
		spcaGrab (outputfile,&fourcc , videodevice, image_width,image_height, format, owidth, oheight,
			grabMethod, videoOn, audioout, videocomp, autobright, statOn, decodeOn);
	}
	break;

	/*       file input output       */
	char *outputfile = NULL;
	static char Picture[80];
	char fourcc[4] = "MJPG";
	FILE *foutpict;
	/*********************************/
	/*          Starting Flags       */

	if(index > 0) index -=10;
	spcaSetTimeInterval(fd,videoparam,index);
}
int spcaGrab (char *outputfile,char (*fourcc)[8] , const char *videodevice, int image_width,int image_height, int format, int owidth, int oheight,
	int grabMethod,int videoOn,int audioout,int videocomp,int autobright,int statOn,int decodeOn) {
	
	

		if(!videoOn) {
		/* acquire raw data force palette to raw */
		printf ("VideoOn = 0\n");
			snprintf (*fourcc, 5, "RAWD");
			format = VIDEO_PALETTE_RAW_JPEG;
			}
		if(videocomp) {
		/* acquire yuv420p and compress diff pixels static huffman */
			snprintf (*fourcc, 5, "DPSH");
			format = VIDEO_PALETTE_YUV420P;
			}
		if (videodevice == NULL || *videodevice == 0) {

			mypict.out_fd = out_fd;
			} else {
			AVI_set_video (out_fd, image_width, image_height, 20,
				       *fourcc);
				       }
			if (audioout && !interval) {
			/* init the sound recorder if no picture*/

Return to bug 336599

Lines 212-218 Link Here

(-)a/spcaview.c (-8 / +7 lines)
212		212
213	int spcaClient (char *Ip, short port,int owidth, int oheight ,int statOn);	213	int spcaClient (char *Ip, short port,int owidth, int oheight ,int statOn);
214	int spcaPlay (char* inputfile, int width, int height);	214	int spcaPlay (char* inputfile, int width, int height);
215	int spcaGrab (char outputfile,char fourcc[4] , const char videodevice, int image_width,int image_height, int format, int owidth, int oheight,	215	int spcaGrab (char outputfile,char (fourcc)[8] , const char *videodevice, int image_width,int image_height, int format, int owidth, int oheight,
216	int grabMethod,int videoOn,int audioout,int videocomp,int autobright,int statOn,int decodeOn);	216	int grabMethod,int videoOn,int audioout,int videocomp,int autobright,int statOn,int decodeOn);
217		217
218	void waitandshoot(void ptr)	218	void waitandshoot(void ptr)
Lines 308-314 Link Here
308	/* avi parametres */	308	/* avi parametres */
309	char *inputfile = NULL;	309	char *inputfile = NULL;
310	char *outputfile = NULL;	310	char *outputfile = NULL;
311	char fourcc[4] = "MJPG";	311	char fourcc[8] = "MJPG";
312		312
313	char *sizestring = NULL;	313	char *sizestring = NULL;
314	int use_libjpeg = 1;	314	int use_libjpeg = 1;
Lines 586-592 Link Here
586	case GRABBER:	586	case GRABBER:
587	{	587	{
588	/* spcaview grabber */	588	/* spcaview grabber */
589	spcaGrab (outputfile,fourcc , videodevice, image_width,image_height, format, owidth, oheight,	589	spcaGrab (outputfile,&fourcc , videodevice, image_width,image_height, format, owidth, oheight,
590	grabMethod, videoOn, audioout, videocomp, autobright, statOn, decodeOn);	590	grabMethod, videoOn, audioout, videocomp, autobright, statOn, decodeOn);
591	}	591	}
592	break;	592	break;
Lines 900-906 Link Here
900	/* file input output */	900	/* file input output */
901	char *outputfile = NULL;	901	char *outputfile = NULL;
902	static char Picture[80];	902	static char Picture[80];
903	char fourcc[4] = "MJPG";
904	FILE *foutpict;	903	FILE *foutpict;
905	/*********************************/	904	/*********************************/
906	/* Starting Flags */	905	/* Starting Flags */
Lines 1354-1360 Link Here
1354	if(index > 0) index -=10;	1353	if(index > 0) index -=10;
1355	spcaSetTimeInterval(fd,videoparam,index);	1354	spcaSetTimeInterval(fd,videoparam,index);
1356	}	1355	}
1357	int spcaGrab (char outputfile,char fourcc[4] , const char videodevice, int image_width,int image_height, int format, int owidth, int oheight,	1356	int spcaGrab (char outputfile,char (fourcc)[8] , const char *videodevice, int image_width,int image_height, int format, int owidth, int oheight,
1358	int grabMethod,int videoOn,int audioout,int videocomp,int autobright,int statOn,int decodeOn) {	1357	int grabMethod,int videoOn,int audioout,int videocomp,int autobright,int statOn,int decodeOn) {
1359		1358
1360		1359
Lines 1453-1464 Link Here
1453	if(!videoOn) {	1452	if(!videoOn) {
1454	/* acquire raw data force palette to raw */	1453	/* acquire raw data force palette to raw */
1455	printf ("VideoOn = 0\n");	1454	printf ("VideoOn = 0\n");
1456	snprintf (fourcc, 5, "RAWD");	1455	snprintf (*fourcc, 5, "RAWD");
1457	format = VIDEO_PALETTE_RAW_JPEG;	1456	format = VIDEO_PALETTE_RAW_JPEG;
1458	}	1457	}
1459	if(videocomp) {	1458	if(videocomp) {
1460	/* acquire yuv420p and compress diff pixels static huffman */	1459	/* acquire yuv420p and compress diff pixels static huffman */
1461	snprintf (fourcc, 5, "DPSH");	1460	snprintf (*fourcc, 5, "DPSH");
1462	format = VIDEO_PALETTE_YUV420P;	1461	format = VIDEO_PALETTE_YUV420P;
1463	}	1462	}
1464	if (videodevice == NULL \|\| *videodevice == 0) {	1463	if (videodevice == NULL \|\| *videodevice == 0) {
Lines 1644-1650 Link Here
1644	mypict.out_fd = out_fd;	1643	mypict.out_fd = out_fd;
1645	} else {	1644	} else {
1646	AVI_set_video (out_fd, image_width, image_height, 20,	1645	AVI_set_video (out_fd, image_width, image_height, 20,
1647	fourcc);	1646	*fourcc);
1648	}	1647	}
1649	if (audioout && !interval) {	1648	if (audioout && !interval) {
1650	/* init the sound recorder if no picture*/	1649	/* init the sound recorder if no picture*/