hornetseye-frame 0.2.0 → 0.3.0

data/Rakefile

@@ -3,10 +3,11 @@ require 'date'
 require 'rake/clean'
 require 'rake/testtask'
 require 'rake/packagetask'
+require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-frame'
-PKG_VERSION = '0.2.0'
+PKG_VERSION = '0.3.0'
 CXX = ENV[ 'CXX' ] || 'g++'
 STRIP = ENV[ 'STRIP' ] || 'strip'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -27,16 +28,16 @@ HOMEPAGE = %q{http://wedesoft.github.com/hornetseye-frame/}
 
 OBJ = CC_FILES.ext 'o'
 $CXXFLAGS = ENV[ 'CXXFLAGS' ] || ''
-$CXXFLAGS = "#{$CXXFLAGS} -fPIC"
-if Config::CONFIG[ 'rubyhdrdir' ]
-  $CXXFLAGS += "#{$CXXFLAGS} -I#{Config::CONFIG[ 'rubyhdrdir' ]} " +
-              "-I#{Config::CONFIG[ 'rubyhdrdir' ]}/#{Config::CONFIG[ 'arch' ]}"
+$CXXFLAGS = "#{$CXXFLAGS} -fPIC -DNDEBUG"
+if RbConfig::CONFIG[ 'rubyhdrdir' ]
+  $CXXFLAGS = "#{$CXXFLAGS} -I#{RbConfig::CONFIG[ 'rubyhdrdir' ]} " +
+              "-I#{RbConfig::CONFIG[ 'rubyhdrdir' ]}/#{RbConfig::CONFIG[ 'arch' ]}"
 else
-  $CXXFLAGS += "#{$CXXFLAGS} -I#{Config::CONFIG[ 'archdir' ]}"
+  $CXXFLAGS = "#{$CXXFLAGS} -I#{RbConfig::CONFIG[ 'archdir' ]}"
 end
-$LIBRUBYARG = Config::CONFIG[ 'LIBRUBYARG' ]
-$SITELIBDIR = Config::CONFIG[ 'sitelibdir' ]
-$SITEARCHDIR = Config::CONFIG[ 'sitearchdir' ]
+$LIBRUBYARG = RbConfig::CONFIG[ 'LIBRUBYARG' ]
+$SITELIBDIR = RbConfig::CONFIG[ 'sitelibdir' ]
+$SITEARCHDIR = RbConfig::CONFIG[ 'sitearchdir' ]
 
 task :default => :all
 
@@ -44,7 +45,7 @@ desc 'Compile Ruby extension (default)'
 task :all => [ SO_FILE ]
 
 file SO_FILE => OBJ do |t|
-   sh "#{CXX} -shared -o #{t.name} #{OBJ} #{$LIBRUBYARG}"
+   sh "#{CXX} -shared -o #{t.name} #{OBJ} -lswscale #{$LIBRUBYARG}"
    sh "#{STRIP} --strip-all #{t.name}"
 end
 
@@ -93,6 +94,7 @@ Rake::PackageTask.new PKG_NAME, PKG_VERSION do |p|
 end
 
 begin
+  require 'rubygems'
   require 'rubygems/builder'
   $SPEC = Gem::Specification.new do |s|
     s.name = PKG_NAME
@@ -166,12 +168,14 @@ rule '.o' => '.cc' do |t|
    sh "#{CXX} #{$CXXFLAGS} -c -o #{t.name} #{t.source}"
 end
 
-file 'ext/frame.o' => [ 'ext/frame.cc', 'ext/frame.hh' ]
-file 'ext/colourspace.o' => [ 'ext/colourspace.cc', 'ext/colourspace.hh',
-                              'ext/frame.hh', 'ext/error.hh' ]
-file 'ext/init.o' => [ 'ext/init.cc', 'ext/frame.hh', 'ext/colourspace.hh',
-                       'ext/error.hh' ]
+file ".depends.mf" do |t|
+  sh "makedepend -f- -- #{$CXXFLAGS} -- #{CC_FILES.join ' '} > #{t.name}"
+end
+CC_FILES.each do |t|
+  file t.ext(".o") => t
+end
+import ".depends.mf"
 
 CLEAN.include 'ext/*.o'
-CLOBBER.include SO_FILE, 'doc', '.yardoc'
+CLOBBER.include SO_FILE, 'doc', '.yardoc', '.depends.mf'
 

data/ext/colourspace.cc

@@ -21,17 +21,65 @@ extern "C" {
 
 using namespace std;
 
-static enum PixelFormat stringToPixelFormat( const string &str ) throw (Error)
+static void setupFormat( const string &typecode, int width, int height, char *memory,
+                         enum PixelFormat *format,
+                         uint8_t **data, int *lineSize ) throw (Error)
 {
-  enum PixelFormat retVal = PIX_FMT_NONE;
-  if ( str == "YV12" )
-    retVal = PIX_FMT_YUV420P;
-  else if ( str == "UBYTERGB" )
-    retVal = PIX_FMT_RGB24;
-  else {
-    ERRORMACRO( false, Error, , "Unsupported colourspace \"" << str << "\"" );
+  if ( typecode == "UBYTE" ) {
+    *format = PIX_FMT_GRAY8;
+    data[ 0 ] = (uint8_t *)memory;
+    lineSize[ 0 ] = width;
+  } else if ( typecode == "UBYTERGB" ) {
+    *format = PIX_FMT_RGB24;
+    data[ 0 ] = (uint8_t *)memory;
+    lineSize[ 0 ] = width * 3;
+  } else if ( typecode == "BGR " ) {
+    *format = PIX_FMT_BGR24;
+    data[ 0 ] = (uint8_t *)memory;
+    lineSize[ 0 ] = width * 3;
+  } else if ( typecode == "BGRA" ) {
+    *format = PIX_FMT_BGRA;
+    data[ 0 ] = (uint8_t *)memory;
+    lineSize[ 0 ] = width * 4;
+  } else if ( typecode == "YV12" ) {
+    *format = PIX_FMT_YUV420P;
+    int
+      width2  = ( width  + 1 ) / 2,
+      height2 = ( height + 1 ) / 2,
+      widtha  = ( width  + 7 ) & ~0x7,
+      width2a = ( width2 + 7 ) & ~0x7;
+    data[ 0 ] = (uint8_t *)memory;
+    data[ 2 ] = (uint8_t *)memory + widtha * height;
+    data[ 1 ] = (uint8_t *)data[ 2 ] + width2a * height2;
+    lineSize[ 0 ] = widtha;
+    lineSize[ 1 ] = ( ( width + 1 ) / 2 + 7 ) & ~0x7;
+    lineSize[ 2 ] = ( ( width + 1 ) / 2 + 7 ) & ~0x7;
+  } else if ( typecode == "I420" ) {
+    *format = PIX_FMT_YUV420P;
+    int
+      width2  = width / 2,
+      height2 = height / 2;
+    data[ 0 ] = (uint8_t *)memory;
+    data[ 2 ] = (uint8_t *)memory + width * height;
+    data[ 1 ] = (uint8_t *)data[ 2 ] + width2 * height2;
+    lineSize[ 0 ] = width;
+    lineSize[ 1 ] = width2;
+    lineSize[ 2 ] = width2;
+  } else if ( typecode == "YUY2" ) {
+    *format = PIX_FMT_YUYV422;
+    int
+      width2 = ( width + 1 ) / 2,
+      widtha = ( width + 3 ) & ~0x3;
+    data[ 0 ] = (uint8_t *)memory;
+    lineSize[ 0 ] = 2 * widtha;
+  } else if ( typecode == "UYVY" ) {
+    *format = PIX_FMT_UYVY422;
+    int widtha = ( width + 1 ) & ~0x1;
+    data[ 0 ] = (uint8_t *)memory;
+    lineSize[ 0 ] = 2 * widtha;
+  } else {
+    ERRORMACRO( false, Error, , "Unsupported colourspace \"" << typecode << "\"" );
   };
-  return retVal;
 }
 
 FramePtr frameToType( const FramePtr in, const string &target ) throw (Error)
@@ -40,22 +88,18 @@ FramePtr frameToType( const FramePtr in, const string &target ) throw (Error)
     width = in->width(),
     height = in->height();
   FramePtr retVal( new Frame( target, width, height ) );
-  uint8_t *sourceData[3];
-  sourceData[0] = (uint8_t *)in->data();
-  sourceData[1] = (uint8_t *)in->data() + width * height * 5 / 4;
-  sourceData[2] = (uint8_t *)in->data() + width * height;
-  int sourceLineSize[3];
-  sourceLineSize[0] = width;
-  sourceLineSize[1] = width / 2;
-  sourceLineSize[2] = width / 2;
-  uint8_t *destData[1];
-  destData[0] = (uint8_t *)retVal->data();
-  int destLineSize[1];
-  destLineSize[0] = retVal->width() * 3;
-  SwsContext *swsContext = sws_getContext( width, height,
-                                           stringToPixelFormat( in->typecode() ),
-                                           width, height,
-                                           stringToPixelFormat( target ),
+  enum PixelFormat sourceFormat;
+  uint8_t *sourceData[4];
+  int sourceLineSize[4];
+  setupFormat( in->typecode(), width, height, in->data(),
+               &sourceFormat, &sourceData[0], &sourceLineSize[0] );
+  enum PixelFormat destFormat;
+  uint8_t *destData[4];
+  int destLineSize[4];
+  setupFormat( retVal->typecode(), width, height, retVal->data(),
+               &destFormat, &destData[0], &destLineSize[0] );
+  SwsContext *swsContext = sws_getContext( width, height, sourceFormat,
+                                           width, height, destFormat,
                                            SWS_FAST_BILINEAR, 0, 0, 0 );
   sws_scale( swsContext, sourceData, sourceLineSize, 0,
              height, destData, destLineSize );

data/ext/colourspace.hh

@@ -16,8 +16,8 @@
 #ifndef COLOURSPACE_HH
 #define COLOURSPACE_HH
 
-#include <ruby.h>
 #include <string>
+#include "rubyinc.hh"
 #include "error.hh"
 #include "frame.hh"
 

data/ext/frame.cc

@@ -62,3 +62,8 @@ char *Frame::data(void)
   return ptr;
 }
 
+void Frame::markRubyMember(void)
+{
+  rb_gc_mark( m_frame );
+}
+

data/ext/frame.hh

@@ -17,7 +17,7 @@
 #define FRAME_HH
 
 #include <boost/smart_ptr.hpp>
-#include <ruby.h>
+#include "rubyinc.hh"
 #include <string>
 
 class Frame
@@ -31,6 +31,7 @@ public:
   int height(void);
   char *data(void);
   VALUE rubyObject(void) { return m_frame; }
+  void markRubyMember(void);
 protected:
   VALUE m_frame;
 };

data/ext/init.cc

@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-#include <ruby.h>
+#include "rubyinc.hh"
 #include "colourspace.hh"
 
 #ifdef WIN32
@@ -32,7 +32,10 @@ extern "C" {
   {
     VALUE rbHornetseye = rb_define_module( "Hornetseye" );
     VALUE cFrame = rb_define_class_under( rbHornetseye, "Frame_", rb_cObject );
+    VALUE cNode = rb_define_class_under( rbHornetseye, "Node", rb_cObject );
     rb_define_method( cFrame, "to_type", RUBY_METHOD_FUNC( frameWrapToType ), 1 );
+    rb_define_method( cNode, "to_type_with_frame",
+                      RUBY_METHOD_FUNC( frameWrapToType ), 1 );
     rb_require( "hornetseye_frame_ext.rb" );
   }
 

data/ext/rubyinc.hh

@@ -0,0 +1,54 @@
+/* HornetsEye - Computer Vision with Ruby
+   Copyright (C) 2006, 2007   Jan Wedekind
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+#ifndef HORNETSEYE_RUBYINC_HH
+#define HORNETSEYE_RUBYINC_HH
+
+#ifdef RSHIFT
+#undef RSHIFT
+#endif
+
+#define gettimeofday rubygettimeofday
+#define timezone rubygettimezone
+#include <ruby.h>
+// #include <version.h>
+#undef timezone
+#undef gettimeofday
+#ifdef read
+#undef read
+#endif
+#ifdef write
+#undef write
+#endif
+#ifdef RGB
+#undef RGB
+#endif
+
+#ifndef RUBY_VERSION_NUMBER
+#define RUBY_VERSION_NUMBER ( RUBY_VERSION_MAJOR * 10000 + \
+                              RUBY_VERSION_MINOR * 100 + \
+                              RUBY_VERSION_TEENY )
+#endif
+
+#ifndef RUBY_METHOD_FUNC
+#define RUBY_METHOD_FUNC(func) ((VALUE (*)(ANYARGS))func)
+#endif
+
+#ifndef xfree
+#define xfree free
+#endif
+
+#endif
+

data/lib/hornetseye-frame/fourcc.rb

@@ -47,10 +47,11 @@ module Hornetseye
 
   module_function :FourCC
 
-  BGR  = FourCC 'R', 'G', 'B', ' '
+  BGR  = FourCC 'B', 'G', 'R', ' '
+  BGRA = FourCC 'B', 'G', 'R', 'A'
   UYVY = FourCC 'U', 'Y', 'V', 'Y'
   YUY2 = FourCC 'Y', 'U', 'Y', '2'
-  # I420 = FourCC 'I', '4', '2', '0'
+  I420 = FourCC 'I', '4', '2', '0'
   YV12 = FourCC 'Y', 'V', '1', '2'
   MJPG = FourCC 'M', 'J', 'P', 'G'
 

data/lib/hornetseye-frame/frame.rb

@@ -39,6 +39,8 @@ module Hornetseye
         case typecode
         when BGR
           width * height * 3
+        when BGRA
+          width * height * 4
         when UYVY
           width * height * 2
         when YUY2
@@ -46,6 +48,8 @@ module Hornetseye
           widtha * height * 2
         when YV12
           width * height * 3 / 2
+        when I420
+          width * height * 3 / 2
         when MJPG
           width * height * 2
         else
@@ -81,6 +85,23 @@ module Hornetseye
       self.class.height
     end
 
+    alias_method :orig_to_type, :to_type
+
+    def to_type( target )
+      if target.is_a? Class
+        if ( target < INT_ and target != UBYTE ) or target < FLOAT_ or
+          target < COMPLEX_
+          to_type( UBYTE ).to_type target
+        elsif target < RGB_ and target != UBYTERGB
+          to_type( UBYTERGB ).to_type target
+        else
+          orig_to_type target
+        end
+      else
+        orig_to_type target
+      end
+    end
+
   end
 
   def Frame( typecode, width, height )

data/lib/hornetseye-frame/node.rb

@@ -0,0 +1,45 @@
+# hornetseye-frame - Colourspace conversions and compression
+# Copyright (C) 2010 Jan Wedekind
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Namespace of Hornetseye computer vision library
+module Hornetseye
+
+  class Node
+
+    alias_method :orig_to_type_with_frame, :to_type_with_frame
+
+    def to_type_with_frame( target )
+      if target.is_a? FourCC
+        if ( typecode < INT_ and typecode != UBYTE ) or typecode < FLOAT_
+          to_type( UBYTE ).to_type target
+        elsif typecode < COMPLEX_
+          real.to_type target
+        elsif typecode < RGB_ and typecode != UBYTERGB
+          to_type( UBYTERGB ).to_type target
+        else
+          orig_to_type_with_frame target
+        end
+      else
+        to_type_without_frame target
+      end
+    end
+
+    alias_method_chain :to_type, :frame
+
+  end
+
+end
+

data/lib/hornetseye_frame_ext.rb

@@ -18,4 +18,4 @@ require 'malloc'
 require 'multiarray'
 require 'hornetseye-frame/fourcc'
 require 'hornetseye-frame/frame'
-
+require 'hornetseye-frame/node'

data/test/tc_frame.rb

@@ -0,0 +1,97 @@
+# hornetseye-frame - Colourspace conversions and compression
+# Copyright (C) 2010 Jan Wedekind
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'test/unit'
+begin
+  require 'rubygems'
+rescue LoadError
+end
+Kernel::require 'hornetseye_frame'
+
+class TC_Frame < Test::Unit::TestCase
+
+  UBYTERGB = Hornetseye::UBYTERGB
+
+  BGR  = Hornetseye::BGR
+  UYVY = Hornetseye::UYVY
+  YUY2 = Hornetseye::YUY2
+  I420 = Hornetseye::I420
+  YV12 = Hornetseye::YV12
+
+  F = Hornetseye::Frame
+
+  def C( *args )
+    Hornetseye::RGB *args
+  end
+
+  def M( *args )
+    Hornetseye::MultiArray *args
+  end
+
+  def F( *args )
+    Hornetseye::Frame *args
+  end
+
+  def test_frame_inspect
+    assert_equal 'Frame(YV12,320,240)', F( YV12, 320, 240 ).inspect
+  end
+
+  def test_frame_to_s
+    assert_equal 'Frame(YV12,320,240)', F( YV12, 320, 240 ).to_s
+  end
+
+  def test_frame_typecode
+    assert_equal YV12, F( YV12, 320, 240 ).typecode
+  end
+
+  def test_frame_width
+    assert_equal 320, F( YV12, 320, 240 ).width
+  end
+
+  def test_frame_height
+    assert_equal 240, F( YV12, 320, 240 ).height
+  end
+
+  def test_frame_shape
+    assert_equal [ 320, 240 ], F( YV12, 320, 240 ).shape
+  end
+
+  def test_typecode
+    assert_equal YV12, F.new( YV12, 320, 240 ).typecode
+  end
+
+  def test_shape
+    assert_equal [ 320, 240 ], F.new( YV12, 320, 240 ).shape
+  end
+
+  def test_width
+    assert_equal 320, F.new( YV12, 320, 240 ).width
+  end
+
+  def test_height
+    assert_equal 240, F.new( YV12, 320, 240 ).height
+  end
+
+  def test_to_type
+    m = M( Hornetseye::UBYTERGB, 160, 120 ).new.fill! C( 32, 64, 128 )
+    [ UYVY, YUY2, I420, YV12 ].each do |c|
+      result = m.to_type( c ).to_type UBYTERGB
+      assert_equal ( m / 8.0 ).round, ( result / 8.0 ).round
+    end
+  end
+
+end
+

data/test/ts_frame.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+# hornetseye-frame - Colourspace conversions and compression
+# Copyright (C) 2010 Jan Wedekind
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'tc_frame'
+

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 +01:00
+date: 2010-10-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,13 +73,17 @@ files:
 - .document
 - lib/hornetseye-frame/fourcc.rb
 - lib/hornetseye-frame/frame.rb
+- lib/hornetseye-frame/node.rb
 - lib/hornetseye_frame_ext.rb
 - ext/init.cc
 - ext/frame.cc
 - ext/colourspace.cc
 - ext/frame.hh
 - ext/colourspace.hh
+- ext/rubyinc.hh
 - ext/error.hh
+- test/ts_frame.rb
+- test/tc_frame.rb
 has_rdoc: yard
 homepage: http://wedesoft.github.com/hornetseye-frame/
 licenses: []
@@ -113,5 +117,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Colourspace conversions and compression
-test_files: []
-
+test_files: 
+- test/tc_frame.rb