hornetseye-v4l2 0.3.3 → 0.3.4

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-v4l2'
-PKG_VERSION = '0.3.3'
+PKG_VERSION = '0.3.4'
 CFG = RbConfig::CONFIG
 CXX = ENV[ 'CXX' ] || 'g++'
 RB_FILES = FileList[ 'lib/**/*.rb' ]

data/ext/v4l2input.cc

@@ -64,6 +64,9 @@ V4L2Input::V4L2Input( const std::string &device, V4L2SelectPtr select ) throw (E
       format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
       format.index = formatIndex++;
       int r = xioctl( VIDIOC_ENUM_FMT, &format );
+#ifndef NDEBUG
+      cerr << "Requesting format " << (formatIndex - 1) << " with result " << r << endl;
+#endif
       if ( r != 0 ) break;
       unsigned int frameSizeIndex = 0;
       while ( true ) {
@@ -72,6 +75,10 @@ V4L2Input::V4L2Input( const std::string &device, V4L2SelectPtr select ) throw (E
         pix.pixel_format = format.pixelformat;
         pix.index = frameSizeIndex++;
         int r = xioctl( VIDIOC_ENUM_FRAMESIZES, &pix );
+#ifndef NDEBUG
+        cerr << "Requesting frame size " << (frameSizeIndex - 1) << " for format "
+             << (formatIndex - 1) << " with result " << r << endl;
+#endif
         if ( r != 0 ) break;
         if ( pix.type == V4L2_FRMSIZE_TYPE_DISCRETE )
           select->add( format.pixelformat, pix.discrete.width, pix.discrete.height );
@@ -90,18 +97,17 @@ V4L2Input::V4L2Input( const std::string &device, V4L2SelectPtr select ) throw (E
         };
       };
     };
-    unsigned int selection = select->make();
-    unsigned int coding = select->coding( selection );
+    select->make();
+    unsigned int coding = select->coding();
 #ifndef NDEBUG
-    cerr << "selection = " << selection << endl
-         << "coding = " << select->coding( selection ) << endl
-         << "w = " << select->width( selection ) << endl
-         << "h = " << select->height( selection ) << endl;
+    cerr << "coding = " << select->coding() << endl
+         << "w = " << select->width() << endl
+         << "h = " << select->height() << endl;
 #endif
     m_format.type                = V4L2_BUF_TYPE_VIDEO_CAPTURE;
     m_format.fmt.pix.field       = V4L2_FIELD_NONE;
-    m_format.fmt.pix.width       = select->width( selection );
-    m_format.fmt.pix.height      = select->height( selection );
+    m_format.fmt.pix.width       = select->width();
+    m_format.fmt.pix.height      = select->height();
     m_format.fmt.pix.pixelformat = coding;
     m_format.fmt.pix.field       = V4L2_FIELD_SEQ_TB;
     ERRORMACRO( xioctl( VIDIOC_S_FMT, &m_format ) == 0, Error, ,

data/ext/v4l2select.cc

@@ -17,7 +17,7 @@
 #include "v4l2select.hh"
 
 V4L2Select::V4L2Select(void) throw (Error):
-  m_rbArray(rb_ary_new())
+  m_rbArray(rb_ary_new()), m_rbSelection(Qnil)
 {
 }
 
@@ -36,33 +36,32 @@ static VALUE yield( VALUE arg )
   return rb_yield( arg );
 }
 
-unsigned int V4L2Select::make(void) throw (Error)
+void V4L2Select::make(void) throw (Error)
 {
   int error;
-  VALUE rbRetVal = rb_protect( yield, m_rbArray, &error );
+  m_rbSelection = rb_protect( yield, m_rbArray, &error );
   if ( error ) {
     VALUE rbError = rb_funcall( rb_gv_get( "$!" ), rb_intern( "message" ), 0 );
     ERRORMACRO( false, Error, , "Error in block to \"V4L2Input.new\": "
                 << StringValuePtr( rbError ) );
   };
-  ERRORMACRO( TYPE( rbRetVal ) == T_FIXNUM, Error, , "Block must return a value of "
-              "type 'Fixnum'" );
-  return NUM2UINT(rbRetVal);
+  ERRORMACRO( TYPE( m_rbSelection ) == T_ARRAY, Error, , "Block must return a value of "
+              "type 'Array'" );
 }
 
-unsigned int V4L2Select::coding( unsigned int selection )
+unsigned int V4L2Select::coding(void)
 {
-  return NUM2INT( RARRAY_PTR( RARRAY_PTR(m_rbArray)[ selection ] )[ 0 ] );
+  return NUM2INT(RARRAY_PTR(m_rbSelection)[ 0 ]);
 }
 
-unsigned int V4L2Select::width( unsigned int selection )
+unsigned int V4L2Select::width(void)
 {
-  return NUM2INT( RARRAY_PTR( RARRAY_PTR(m_rbArray)[ selection ] )[ 1 ] );
+  return NUM2INT(RARRAY_PTR(m_rbSelection)[ 1 ]);
 }
 
-unsigned int V4L2Select::height( unsigned int selection )
+unsigned int V4L2Select::height(void)
 {
-  return NUM2INT( RARRAY_PTR( RARRAY_PTR(m_rbArray)[ selection ] )[ 2 ] );
+  return NUM2INT(RARRAY_PTR(m_rbSelection)[ 2 ]);
 }
 
 VALUE V4L2Select::wrapRescue( VALUE rbValue )

data/ext/v4l2select.hh

@@ -26,13 +26,14 @@ public:
   V4L2Select(void) throw (Error);
   virtual ~V4L2Select(void);
   void add( unsigned int coding, unsigned int width, unsigned int height );
-  unsigned int make(void) throw (Error);
-  unsigned int coding( unsigned int selection );
-  unsigned int width( unsigned int selection );
-  unsigned int height( unsigned int selection );
+  void make(void) throw (Error);
+  unsigned int coding(void);
+  unsigned int width(void);
+  unsigned int height(void);
   static VALUE wrapRescue( VALUE rbValue );
 protected:
   VALUE m_rbArray;
+  VALUE m_rbSelection;
 };
 
 typedef boost::shared_ptr< V4L2Select > V4L2SelectPtr;

data/lib/hornetseye-v4l2/v4l2input.rb

@@ -49,26 +49,24 @@ module Hornetseye
                   MODE_GREY   => UBYTE,
                   MODE_RGB24  => UBYTERGB,
                   MODE_BGR24  => BGR }
-          frame_types, index = [], []
-          modes.each_with_index do |mode,i|
-            target = map[ mode.first ]
+          frame_types = []
+          modes.each_with_index do |mode|
+            target = map[mode.first]
             if target
-              frame_types.push Hornetseye::Frame( target, *mode[ 1 .. 2 ] )
-              index.push i
+              frame_types.push Hornetseye::Frame(target, *mode[1 .. 2])
             end
           end
           if action
             desired = action.call frame_types
           else
-            preference = [ I420, UYVY, YUY2, UBYTERGB, BGR, UBYTE ]
+            preference = [I420, UYVY, YUY2, UBYTERGB, BGR, UBYTE]
             desired = frame_types.sort_by do |mode|
               [ -preference.index( mode.typecode ), mode.width * mode.height ]
             end.last
           end
-          unless frame_types.member? desired
-            raise "Frame type #{desired.inspect} not supported by camera"
-          end
-          index[ frame_types.index( desired ) ]
+          mode = map.invert[desired.typecode]
+          raise "Video mode #{desired.typecode} not supported" unless mode
+          [mode, desired.width, desired.height]
         end
       end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-06 00:00:00 +01:00
+date: 2011-06-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency