camcapture 0.2.0-i686-linux → 0.3.0-i686-linux

data/README

@@ -10,10 +10,7 @@ in combination with TCPServer, sockets, serial port communication (Ruby/Serialpo
  
 -- Installation --
 
-$ cd ext
-$ ruby extconf.rb
-$ make
-$ sudo make install
+$ sudo ./setup.rb 
 
 -- Testing --
 

data/ext/ruby_camcapture.c

@@ -49,7 +49,7 @@ static void put16(unsigned int value, FILE* outf)
 static VALUE cam_capture_save_bmp(VALUE self, VALUE filename)
 {
     VALUE image,image2;
-    char *imageData=RSTRING(image)->ptr;
+    char *imageData;
     char *fnx=RSTRING(filename)->ptr;
     int  width,height;
     int  h,w,r,g,b;
@@ -209,10 +209,10 @@ static VALUE cam_capture_to_bgr(VALUE self)
     int  width,height;
     VALUE rwidth, rheight;
 
-    rwidth=rb_iv_get(self, "@width");
-    width=NUM2INT(rwidth);
-    rheight=rb_iv_get(self, "@height");
-    height=NUM2INT(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);
@@ -231,11 +231,20 @@ static VALUE cam_capture_to_bgr(VALUE self)
     return self;
 }
 
+static VALUE cam_address(VALUE self)
+{
+    char *ptr;
+    VALUE str = rb_iv_get(self, "@image");
+    ptr = RSTRING(str)->ptr;
+    return INT2FIX((int)ptr);
+}
+
 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);
+  rb_define_method(cCamCapture, "address", cam_address, 0);
 
 #define VIDEO_PALETTE_GREY	1	/* Linear greyscale */
 #define VIDEO_PALETTE_HI240	2	/* High 240 cube (BT848) */
@@ -259,32 +268,4 @@ void Init_camcapture() {
   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(
-	"class CamCapture\n"
-
-          "attr_reader :width, :height, :image\n"
-
-	  "def CamCapture.new(device_number=0, w=0, h=0, palette=0)\n"
-	    "cap = create(device_number, w, h, palette)\n"
-            "return cap\n"
-	  "end\n"
-
-          "def capture\n"
-            "sysread(@width*@height*3, @image)\n"
-          "end\n"
-
-	"end\n"
-  );
 }
-
-/* For CamelliaLib interfacing :
- *
-          "def capture(image)\n"
-            "image.alloc_bgr(@width, @height) if image.width != @width or image.height != @height or not image.allocated?\n"
-            "if image.widthStep != @width*3 then image=nil; return; end\n"
-            "image.set_pixels(sysread(@width*@height*3,@image))\n"
-          "end\n"
- */
-

data/lib/camcapture.rb

@@ -8,9 +8,22 @@ class CamCapture
     return cap
   end
 
-  def capture
-    sysread(@width*@height*3, @image)
+  if Module.constants.include?("Camellia") then  
+    def capture
+      @camimage ||= Camellia::CamImage.new
+      if not @camimage.allocated? or @camimage.width != @width or @camimage.height != @height
+	@camimage.fill_header(@width, @height, Camellia::CAM_DEPTH_8U, Camellia::CAM_CHANNELSEQ_RGB) 
+	if @camimage.widthStep != @width*3 then @camimage = nil; return; end
+      end
+      sysread(@width*@height*3,@image)
+      @camimage.set_image_data(@image)
+    end
+  else
+    def capture
+      sysread(@width*@height*3, @image)
+    end
   end
+
 end
 
 

data/test/test_camellia.rb

@@ -0,0 +1,17 @@
+require 'camellia'
+begin
+  require 'camcapture'
+  puts "Successfully loaded module camcapture"
+rescue LoadError
+  require 'rubygems'
+  require 'camcapture'
+  puts "Successfully loaded gem camcapture"
+end
+
+camera=CamCapture.new 0, 320, 240
+puts "Image size is #{camera.width}x#{camera.height}"
+for i in 1..10 do
+  image=camera.capture
+  puts "image #{i} : #{image.imageSize} bytes grabbed"
+  image.save_bmp("grab#{i}.bmp")
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: camcapture
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-10-08 00:00:00 +02:00
+  version: 0.3.0
+date: 2007-11-27 00:00:00 +01:00
 summary: Camera/Webcam capture using Video4Linux interface. Compatible with Ruby Threads.
 require_paths: 
 - lib
@@ -35,6 +35,7 @@ files:
 - README
 test_files: 
 - test/test.rb
+- test/test_camellia.rb
 rdoc_options: []
 
 extra_rdoc_files: