framegrabber 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e85230c8feff750acc1216b7e0a300ec237879b0e2fa6b09e3ce0b22d38768d8
-  data.tar.gz: 50ccf739a1d30d016a2958081bc9e856fca5d47c28d6b1d020d3c02c41eff303
+  metadata.gz: ca71c2ed88eb8c9fff0b84e5ccce2e2b3cd47a592003c6873211e010ff6f1030
+  data.tar.gz: 78452778dc8da4d4d448785d1d7c1d9cf2c03ca25115eb267f6096f73b57a329
 SHA512:
-  metadata.gz: 2d09d0a476009f5df20eabfb458284f7908721532f64653d3031e582c6d5bb8d334f977058951b38ee27e698e876405675257b559bf1cf7847a70b6596a29189
-  data.tar.gz: db51d1a46ce336c1368a00877106a6246037f70340e5318bd49e1522696f2e4b7c5a31d4003c7f897df5695170e6b3b8921020f9a2d64349f606d1ec18afdeea
+  metadata.gz: e3769f1926ff4bf6f6e74c898cdeb0475b9c2a1e42fd5670c17c2e3368cb0fafa51da76492c379321cd69667171f02733b03df9b067373758706200113050007
+  data.tar.gz: 4d203839ec8072ced2e3f972c714910496374fa43e33eb83e043d6221f805f41d4859f970e033b8a0cb7dd9a5102450bf0fc0ee1a4ebf02e299f555d02618e6a

data/Gemfile.lock

@@ -30,6 +30,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-21
+  arm64-darwin-24
 
 DEPENDENCIES
   framegrabber!

data/README.md

@@ -42,7 +42,7 @@ If bundler is not being used to manage dependencies, install the gem by executin
 def grab_a_nice_image
   # Open a camera, camera ids are numbered starting with 0.
   # We support only one camera at a time.
-  # You can call this now and grab multiple frames 
+  # You can call this once and grab multiple frames 
   # before you close it.
   Framegrabber.open(0)
 
@@ -53,10 +53,9 @@ def grab_a_nice_image
   @image = Framegrabber.grab_image
 
 rescue RuntimeError => e
-  
-  # Camera may be unavailable or frame might be empty
-  # At this point we don't have nice error handling
-  puts "Oh no! #{e.message}"
+
+   # Camera may be unavailable or frame might be empty
+   puts "Oh no! #{e.message}"
 ensure
   
   # Camera will stay active until it is released
@@ -72,7 +71,7 @@ Use `bin/console` to poke around and see what you can improve.
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/khasinski/framegrabber. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/framegrabber/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/khasinski/framegrabber. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/khasinski/framegrabber/blob/master/CODE_OF_CONDUCT.md).
 
 ## License
 

data/ext/grab_frame_ext/extconf.rb

@@ -1,9 +1,13 @@
-require "mkmf"
-require "pkg-config"
+require 'mkmf'
 
-$CXXFLAGS << " -std=c++11 "
+$CXXFLAGS << ' -std=c++11 '
 
-$INCFLAGS << " " + PKGConfig.cflags("opencv4")
-$LDFLAGS << " " + PKGConfig.libs("opencv4")
+# Direct paths for OpenCV
+opencv_prefix = '/opt/homebrew/opt/opencv'
+$INCFLAGS << " -I#{opencv_prefix}/include/opencv4"
+$LDFLAGS << " -L#{opencv_prefix}/lib"
+$LDFLAGS << ' -lopencv_gapi -lopencv_stitching -lopencv_alphamat -lopencv_aruco -lopencv_bgsegm -lopencv_bioinspired -lopencv_ccalib -lopencv_dnn_objdetect -lopencv_dnn_superres -lopencv_dpm -lopencv_face -lopencv_freetype -lopencv_fuzzy -lopencv_hfs -lopencv_img_hash -lopencv_intensity_transform -lopencv_line_descriptor -lopencv_mcc -lopencv_quality -lopencv_rapid -lopencv_reg -lopencv_rgbd -lopencv_saliency -lopencv_sfm -lopencv_signal -lopencv_stereo -lopencv_structured_light -lopencv_phase_unwrapping -lopencv_superres -lopencv_optflow -lopencv_surface_matching -lopencv_tracking -lopencv_highgui -lopencv_datasets -lopencv_text -lopencv_plot -lopencv_videostab -lopencv_videoio -lopencv_viz -lopencv_wechat_qrcode -lopencv_xfeatures2d -lopencv_shape -lopencv_ml -lopencv_ximgproc -lopencv_video -lopencv_xobjdetect -lopencv_objdetect -lopencv_calib3d -lopencv_imgcodecs -lopencv_features2d -lopencv_dnn -lopencv_flann -lopencv_xphoto -lopencv_photo -lopencv_imgproc -lopencv_core'
 
-create_makefile("grab_frame_ext")
+have_header('unistd.h') # for usleep
+
+create_makefile('grab_frame_ext')

data/ext/grab_frame_ext/grab_frame_ext.cpp

@@ -2,21 +2,37 @@
 #include <opencv2/core.hpp>
 #include <opencv2/videoio.hpp>
 #include <grab_frame_ext.hpp>
+#include <unistd.h>
 
 using namespace cv;
 using namespace std;
 
 static VALUE open(VALUE _self, VALUE deviceID) {
     int camID = NUM2INT(deviceID);
-    Mat frame;
     cap.open(camID);
 
-    cap.read(frame);
-    sleep(1);
-
     if (!cap.isOpened()) {
       rb_raise(rb_eRuntimeError, "Unable to open camera %d", camID);
     }
+
+    // Wait for camera to provide a valid frame
+    Mat frame;
+    int attempts = 0;
+    const int max_attempts = 50; // 5 seconds at 100ms intervals
+    while (attempts < max_attempts) {
+      cap.read(frame);
+      if (!frame.empty()) {
+        break;
+      }
+      usleep(100000); // 100ms
+      attempts++;
+    }
+
+    if (frame.empty()) {
+      cap.release();
+      rb_raise(rb_eRuntimeError, "Camera %d failed to provide valid frame within timeout", camID);
+    }
+
     return Qnil;
 }
 
@@ -51,9 +67,9 @@ static VALUE grab_frame(VALUE _self) {
     for(j=0; j<frame.cols; j++) {
       VALUE pixel = rb_ary_new_capa(3);
       unsigned char * p = frame.ptr(i, j); // Y first, X after
-      rb_ary_store(pixel, 2, ULL2NUM(p[2]*255)); // R
-      rb_ary_store(pixel, 1, ULL2NUM(p[1]*255)); // G
-      rb_ary_store(pixel, 0, ULL2NUM(p[0]*255)); // B
+      rb_ary_store(pixel, 0, ULL2NUM(p[2])); // R
+      rb_ary_store(pixel, 1, ULL2NUM(p[1])); // G
+      rb_ary_store(pixel, 2, ULL2NUM(p[0])); // B
 
       rb_ary_store(row, j, pixel);
     }

data/lib/framegrabber/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Framegrabber
-  VERSION = "0.1.0"
+  VERSION = '0.2.0'
 end

data/lib/framegrabber.rb

@@ -1,18 +1,38 @@
 # frozen_string_literal: true
 
-require_relative "framegrabber/version"
-require "grab_frame_ext"
+require_relative 'framegrabber/version'
+require 'grab_frame_ext'
 begin
   require 'rmagick'
 rescue LoadError
 end
 
-
 module Framegrabber
-  if const_defined?("Magick")
+  if const_defined?('Magick')
     def self.grab_image
+      # Discard first frame (original hack to ensure camera is ready)
+      grab_frame
       frame = grab_frame
-      Magick::Image.constitute(frame.first.size, frame.size, "BGR", frame.flatten)
+
+      # Use system ImageMagick to convert raw RGB data to image
+      require 'tempfile'
+      Tempfile.open(['framegrabber', '.rgb']) do |temp_rgb|
+        temp_rgb.binmode
+        temp_rgb.write(frame.flatten.pack('C*'))
+        temp_rgb.close
+
+        Tempfile.open(['framegrabber', '.png']) do |temp_png|
+          temp_png.close
+
+          # Convert RGB data to PNG using ImageMagick
+          system('magick', '-size', "#{frame.first.size}x#{frame.size}",
+                 '-depth', '8', "rgb:#{temp_rgb.path}", temp_png.path)
+
+          # Read the PNG with RMagick
+          img = Magick::Image.read(temp_png.path).first
+          return img
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: framegrabber
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Krzysztof Hasiński
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -70,6 +69,7 @@ files:
 - ext/grab_frame_ext/extconf.rb
 - ext/grab_frame_ext/grab_frame_ext.cpp
 - ext/grab_frame_ext/grab_frame_ext.hpp
+- framegrabber-0.1.0.gem
 - lib/framegrabber.rb
 - lib/framegrabber/version.rb
 - sig/framegrabber.rbs
@@ -79,7 +79,6 @@ licenses:
 metadata:
   homepage_uri: https://github.com/khasinski/framegrabber
   source_code_uri: https://github.com/khasinski/framegrabber
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -94,8 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.6.8
 specification_version: 4
 summary: Uses OpenCV to grab frames from cameras
 test_files: []