diff example/feed.c @ 7:2fce9e157b8d

Added some work around to work with kernel 2.6.27-rc3, added debug param.

--- a/example/feed.c	Sat Jul 12 17:12:25 2008 +0000
+++ b/example/feed.c	Sun Aug 24 02:20:51 2008 +0000
@@ -20,52 +20,61 @@
 #include <linux/videodev.h>
 
 
-int fmt=0;
+int fmt = 0;
 int noexit = 1;
-int read_img=0;
+int read_img = 0;
 
 char *start_capture (int dev, int width, int height)
 {
-        struct video_capability vid_caps;
+    struct video_capability vid_caps;
 	struct video_window vid_win;
 	struct video_mbuf vid_buf;
 	char *map;
 
-	if (ioctl (dev, VIDIOCGCAP, &vid_caps) == -1) {
-		printf ("ioctl (VIDIOCGCAP)\nError[%s]\n",strerror(errno));
+	if (ioctl(dev, VIDIOCGCAP, &vid_caps) == -1) {
+		printf ("ioctl (VIDIOCGCAP)\nError[%s]\n", strerror(errno));
 		return (NULL);
 	}
-	if (vid_caps.type & VID_TYPE_MONOCHROME) fmt=VIDEO_PALETTE_GREY;
+
+	if (vid_caps.type & VID_TYPE_MONOCHROME) 
+		fmt=VIDEO_PALETTE_GREY;
+
 	if (ioctl (dev, VIDIOCGMBUF, &vid_buf) == -1) {
 		fprintf(stderr, "no mmap falling back on read\n");
+
 		if (ioctl (dev, VIDIOCGWIN, &vid_win)== -1) {
 			printf ("ioctl VIDIOCGWIN\nError[%s]\n",strerror(errno));
 			return (NULL);
 		}
-		vid_win.width=width;
-		vid_win.height=height;
+
+		vid_win.width  = width;
+		vid_win.height = height;
+
 		if (ioctl (dev, VIDIOCSWIN, &vid_win)== -1) {
 			printf ("ioctl VIDIOCSWIN\nError[%s]\n",strerror(errno));
 			return (NULL);
 		}
-		read_img=1;
-		map=malloc(width*height*3);
+
+		read_img = 1;
+		map = malloc(width * height * 3);
 		return (map);
 	}
+
 	/* If we are going to capture greyscale we need room to blow the image up */
-	if (fmt==VIDEO_PALETTE_GREY)
-		map=mmap(0, vid_buf.size*3, PROT_READ|PROT_WRITE, MAP_SHARED, dev, 0);
+	if (fmt == VIDEO_PALETTE_GREY)
+		map = mmap(0, vid_buf.size * 3, PROT_READ|PROT_WRITE, MAP_SHARED, dev, 0);
 	else
-		map=mmap(0, vid_buf.size, PROT_READ|PROT_WRITE, MAP_SHARED, dev, 0);
+		map = mmap(0, vid_buf.size, PROT_READ|PROT_WRITE, MAP_SHARED, dev, 0);
 	
 	if ((unsigned char *)-1 == (unsigned char *)map)
 		return (NULL);
+
 	return map;
 }
 
 int start_pipe (int dev, int width, int height)
 {
-        struct video_capability vid_caps;
+    struct video_capability vid_caps;
 	struct video_window vid_win;
 	struct video_picture vid_pic;
 
@@ -73,22 +82,28 @@
 		printf ("ioctl (VIDIOCGCAP)\nError[%s]\n",strerror(errno));
 		return (1);
 	}
-	if (ioctl (dev, VIDIOCGPICT, &vid_pic)== -1) {
+	
+	if (ioctl(dev, VIDIOCGPICT, &vid_pic) == -1) {
 		printf ("ioctl VIDIOCGPICT\nError[%s]\n",strerror(errno));
 		return (1);
 	}
-	vid_pic.palette=fmt;
-	if (ioctl (dev, VIDIOCSPICT, &vid_pic)== -1) {
+
+	vid_pic.palette = fmt;
+
+	if (ioctl (dev, VIDIOCSPICT, &vid_pic) == -1) {
 		printf ("ioctl VIDIOCSPICT\nError[%s]\n",strerror(errno));
 		return (1);
 	}
-	if (ioctl (dev, VIDIOCGWIN, &vid_win)== -1) {
+
+	if (ioctl (dev, VIDIOCGWIN, &vid_win) == -1) {
 		printf ("ioctl VIDIOCGWIN");
 		return (1);
 	}
-	vid_win.width=width;
-	vid_win.height=height;
-	if (ioctl (dev, VIDIOCSWIN, &vid_win)== -1) {
+
+	vid_win.width = width;
+	vid_win.height = height;
+	
+	if (ioctl (dev, VIDIOCSWIN, &vid_win) == -1) {
 		printf ("ioctl VIDIOCSWIN");
 		return (1);
 	}
@@ -101,47 +116,52 @@
 	char *grey, *rgb;
 	struct video_mmap vid_mmap;
 
-    	sigset_t    set, old;
+   	sigset_t set, old;
 
 	if (read_img) {
-		if (fmt==VIDEO_PALETTE_GREY) {
-			if (read(dev, map, width*height) != width*height)
+		
+		if (fmt == VIDEO_PALETTE_GREY) {
+			size_t size = width * height;
+			if (read(dev, map, size) != size)
 				return NULL;
 		} else {
-			if (read(dev, map, width*height*3) != width*height*3)
+			size_t size = width * height * 3;
+			if (read(dev, map, size) != size)
 				return NULL;
 		}
 	} else {
-		vid_mmap.format=fmt;
-		vid_mmap.frame=0;
-		vid_mmap.width=width;
-		vid_mmap.height=height;
+		vid_mmap.format = fmt;
+		vid_mmap.frame  = 0;
+		vid_mmap.width  = width;
+		vid_mmap.height = height;
     
-        	sigemptyset (&set);	     //BTTV hates signals during IOCTL
-	        sigaddset (&set, SIGCHLD);   //block SIGCHLD & SIGALRM
-       		sigaddset (&set, SIGALRM);   //for the time of ioctls
-        	sigprocmask (SIG_BLOCK, &set, &old);
+        sigemptyset (&set);	                 //BTTV hates signals during IOCTL
+	    sigaddset (&set, SIGCHLD);           //block SIGCHLD & SIGALRM
+       	sigaddset (&set, SIGALRM);           //for the time of ioctls
+        sigprocmask (SIG_BLOCK, &set, &old);
                     
 		if (ioctl(dev, VIDIOCMCAPTURE, &vid_mmap) == -1) {
-	        	sigprocmask (SIG_UNBLOCK, &old, NULL);
+            sigprocmask (SIG_UNBLOCK, &old, NULL);
 			return (NULL);
 		}
+
 		if (ioctl(dev, VIDIOCSYNC, &vid_mmap) == -1) {
-	        	sigprocmask (SIG_UNBLOCK, &old, NULL);
+	        sigprocmask (SIG_UNBLOCK, &old, NULL);
 			return (NULL);
 		}
 		
-        	sigprocmask (SIG_UNBLOCK, &old, NULL); //undo the signal blocking
+        sigprocmask(SIG_UNBLOCK, &old, NULL); //undo the signal blocking
 	}
 	/* Blow up a grey */
-	if (fmt==VIDEO_PALETTE_GREY) {
-		i=width*height;
-		grey=map+i-1;
-		rgb=map+i*3;
-		for (; i>=0; i--, grey--) {
-			*(rgb--)=*grey;
-			*(rgb--)=*grey;
-			*(rgb--)=*grey;
+	if (fmt == VIDEO_PALETTE_GREY) {
+		i= width * height;
+		grey=map + i - 1;
+		rgb=map + i * 3;
+
+		for (; i >= 0; i--, grey--) {
+			*(rgb--) =*grey;
+			*(rgb--) =*grey;
+			*(rgb--) =*grey;
 		}
 	}
 	return map;
@@ -149,10 +169,13 @@
 
 int put_image(int dev, char *image, int width, int height)
 {
-	if (write(dev, image, width*height*3)!=width*height*3) {
-		printf("Error writing image to pipe!\nError[%s]\n",strerror(errno));
+	size_t size = width * height * 3;
+
+	if (write(dev, image, size) != size) {
+		printf("Error writing image to pipe!\nError[%s]\n", strerror(errno));
 		return 0;
 	}
+
 	return 1;
 }
 
@@ -168,7 +191,7 @@
 	int width;
 	int height;
 	char *image_new;
-	char palette[10]={'\0'};
+	char palette[10] = {'\0'};
 	
 	if (argc != 5) {
 		printf("Usage:\n\n");
@@ -176,28 +199,34 @@
 		printf("example: feed /dev/video0 /dev/video1 352x288 yuv420p\n\n");
 		exit(1);
 	}
+
 	sscanf(argv[3], "%dx%d", &width, &height);
 	sscanf(argv[4], "%s", palette);
 
-	if (!strcmp(palette,"rgb24")) fmt = VIDEO_PALETTE_RGB24;
-	else if (!strcmp(palette,"yuv420p")) fmt = VIDEO_PALETTE_YUV420P;		
+	if (!strcmp(palette,"rgb24")) 
+		fmt = VIDEO_PALETTE_RGB24;
+	else if (!strcmp(palette,"yuv420p")) 
+		fmt = VIDEO_PALETTE_YUV420P;		
 	else fmt = VIDEO_PALETTE_RGB24; 
 		
-	devin=open (argv[1], O_RDWR);
+	devin = open (argv[1], O_RDWR);
+
 	if (devin < 0) {
-		printf ("Failed to open video device %s\nError[%s]\n",argv[1],strerror(errno));
+		printf ("Failed to open video device %s\nError[%s]\n", argv[1], strerror(errno));
 		exit(1);
 	}
 
-	devout=open (argv[2], O_RDWR);
+	devout = open (argv[2], O_RDWR);
+
 	if (devout < 0) {
-		printf ("Failed to open video device%s \nError[%s]\n",argv[2],strerror(errno));
+		printf ("Failed to open video device%s \nError[%s]\n", argv[2], strerror(errno));
 		exit(1);
 	}
 
-	image_new=start_capture (devin, width, height);
+	image_new = start_capture(devin, width, height);
+
 	if (!image_new) {
-		printf("Capture error\nError[%s]\n",strerror(errno));
+		printf("Capture error\nError[%s]\n", strerror(errno));
 		exit(1);
 	}
 
@@ -206,12 +235,25 @@
 	signal(SIGTERM, sig_handler);
 	
 	printf("Starting video stream.\n");
-	while ( (next_capture(devin, image_new, width, height)) && (noexit)) {
-		if (put_image(devout, image_new, width, height)==0)
+	
+	while ((next_capture(devin, image_new, width, height)) && (noexit)) {
+		if (put_image(devout, image_new, width, height) == 0) 
 			exit(1);
+			
 	}
-	printf("You bought vaporware!\nError[%s]\n",strerror(errno));
-	close (devin);
-	close (devout);
+
+	printf("You bought vaporware!\nError[%s]\n", strerror(errno));
+
+	close(devin);
+	close(devout);
+
+	if ((read_img) && (image_new))
+		free(image_new);
+	else if (fmt == VIDEO_PALETTE_GREY)
+		munmap(image_new, width * height * 3);
+	else
+		munmap(image_new, width * height);
+
+
 	exit(0);
 }