camcapture 0.1.0-i686-linux → 0.2.0-i686-linux

data/ext/ruby_camcapture.c

@@ -174,7 +174,11 @@ static VALUE cam_capture_create(VALUE class, VALUE device_number, VALUE width, V
         return Qnil;
     }
     vid_chan.channel = 0;
-    vid_chan.norm = VIDEO_MODE_NTSC;
+    if (NUM2INT(palette) & 32) {
+	vid_chan.norm = VIDEO_MODE_NTSC;
+    } else {
+	vid_chan.norm = VIDEO_MODE_PAL;
+    }
     if (ioctl(fd, VIDIOCSCHAN, &(vid_chan)) == -1) {
         rb_raise(rb_eIOError, "CamCapture : VIDIOCSCHAN");
         return Qnil;
@@ -196,10 +200,42 @@ static VALUE cam_capture_create(VALUE class, VALUE device_number, VALUE width, V
     return (VALUE) capture;
 }
 
+static VALUE cam_capture_to_bgr(VALUE self)
+{
+    VALUE image, image2;
+    char *imageData;
+    int x, y;
+    char r;
+    int  width,height;
+    VALUE rwidth, rheight;
+
+    rwidth=rb_iv_get(self, "@width");
+    width=NUM2INT(rwidth);
+    rheight=rb_iv_get(self, "@height");
+    height=NUM2INT(rheight);
+    
+    image=rb_iv_get(self, "@image");
+    image2=StringValue(image);
+    if (RSTRING(image2)->len != width*height*3) {
+        rb_raise(rb_eRuntimeError, "image is not correct");
+    }
+    imageData=RSTRING(image2)->ptr;
+    for (y = 0; y < height; y++) {
+	for (x = 0; x < width; x++) {
+	    r = *imageData;
+	    *imageData = *(imageData + 2);
+	    *(imageData + 2) = r;
+	    imageData += 3;
+	}
+    }
+    return self;
+}
+
 void Init_camcapture() {
   cCamCapture = rb_define_class("CamCapture", rb_cIO);
   rb_define_singleton_method(cCamCapture, "create", cam_capture_create, 4);
   rb_define_method(cCamCapture, "save_bmp", cam_capture_save_bmp, 1);
+  rb_define_method(cCamCapture, "to_bgr", cam_capture_to_bgr, 0);
 
 #define VIDEO_PALETTE_GREY	1	/* Linear greyscale */
 #define VIDEO_PALETTE_HI240	2	/* High 240 cube (BT848) */
@@ -220,8 +256,9 @@ void Init_camcapture() {
 
   rb_define_const(cCamCapture, "GREY", INT2FIX(VIDEO_PALETTE_GREY));
   rb_define_const(cCamCapture, "RGB24", INT2FIX(VIDEO_PALETTE_RGB24));
-  rb_define_const(cCamCapture, "RGB32", INT2FIX(VIDEO_PALETTE_RGB32));
   rb_define_const(cCamCapture, "YUV422", INT2FIX(VIDEO_PALETTE_YUV422));
+  rb_define_const(cCamCapture, "PAL", INT2FIX(0));
+  rb_define_const(cCamCapture, "NTSC", INT2FIX(32));
 
   /* The following definitions are more easily carried out in Ruby */
   rb_eval_string(
@@ -235,7 +272,7 @@ void Init_camcapture() {
 	  "end\n"
 
           "def capture\n"
-            "sysread(@width*@height*3,@image)\n"
+            "sysread(@width*@height*3, @image)\n"
           "end\n"
 
 	"end\n"

data/lib/camcapture.rb

@@ -9,7 +9,7 @@ class CamCapture
   end
 
   def capture
-    sysread(@width*@height*3,@image)
+    sysread(@width*@height*3, @image)
   end
 end
 

data/test/test.rb

@@ -1,11 +1,13 @@
 begin
   require 'camcapture'
+  puts "Successfully loaded module camcapture"
 rescue LoadError
   require 'rubygems'
-  require_gem 'camcapture'
+  require 'camcapture'
+  puts "Successfully loaded gem camcapture"
 end
 
-camera=CamCapture.new 0, 320, 240 
+camera=CamCapture.new 0, 320, 240
 puts "Image size is #{camera.width}x#{camera.height}"
 for i in 1..10 do
   image=camera.capture

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: camcapture
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2006-10-06 00:00:00 +02:00
+  version: 0.2.0
+date: 2007-10-08 00:00:00 +02:00
 summary: Camera/Webcam capture using Video4Linux interface. Compatible with Ruby Threads.
 require_paths: 
 - lib