[patch] gyacheupload-v4l_all_1.0.6.patch

gyacheupload-v4l_all_1.0.6.patch (text/plain), 1.79 KB, created by Natanael Copa on 2005-03-12 03:59:22 UTC

--- gyach.orig/src/webcam/gyacheupload-v4l.c	2005-03-08 22:17:43.788677392 +0100
+++ gyach/src/webcam/gyacheupload-v4l.c	2005-03-09 16:27:18.279571835 +0100
@@ -66,7 +66,7 @@
     everybody else can update theirs from the config window */
 
 int fix_color=1;
-int hue=47104, contrast=65280, brightness=65280, colour=17152;
+int hue=32767, contrast=32767, brightness=32767, colour=32767;
 
 unsigned char* grab_one(int *, int *);
 int grab_init();
@@ -163,6 +163,10 @@
 	if (contrast > -1) grab_pic.contrast=contrast;
 	if (brightness > -1) grab_pic.brightness=brightness;
 	if (colour > -1) grab_pic.colour=colour;
+	/* hardcoded... */
+	grab_pic.depth = 24;
+	grab_pic.palette = VIDEO_PALETTE_RGB24;
+
 	if (ioctl(grab_fd, VIDIOCSPICT, &grab_pic) == -1) {
 		show_error_dialog("An error occurred at 'ioctl VIDIOCSPICT'.\nCould not set camera properties.");
 		return; 
@@ -189,6 +193,7 @@
 
 
 int grab_init() {
+	static struct video_mbuf mbuf;
         if ((grab_fd = open(v_device,O_RDWR)) == -1 ) {
 		show_error_dialog("Could not open Video4Linux device.\nThe device may already be in use.");
 		return 0; 
@@ -206,7 +211,6 @@
 		return 0; 
 		}
 	
-
 	/* The line below cannot work: we must force use of RGB24 for 
 	    PNM image creation */
 	/* grab_buf.format=grab_pic.palette; */ 
@@ -222,7 +226,18 @@
 	grab_buf.width  = x;
 	grab_buf.height = y;
 	grab_size = x * y * w;
-	grab_data = mmap(0,grab_size,PROT_READ|PROT_WRITE,MAP_SHARED,grab_fd,0);
+	set_picture();
+	
+	if (ioctl (grab_fd, VIDIOCGMBUF, &mbuf) < 0) {
+		show_error_dialog("An error occurred at 'ioctl VIDIOCGMBUF'.");
+		return 0; 
+		}
+	if ((grab_data = mmap(0, mbuf.size, PROT_READ|PROT_WRITE, MAP_SHARED,
+						  grab_fd,0)) == MAP_FAILED) {
+		perror("mmap");
+		show_error_dialog("An error occurred at 'mmap'.");
+		return 0;
+	}
 	return(1);
 	}