hornetseye-frame 0.1.0 → 0.2.0

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/packagetask'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-frame'
-PKG_VERSION = '0.1.0'
+PKG_VERSION = '0.2.0'
 CXX = ENV[ 'CXX' ] || 'g++'
 STRIP = ENV[ 'STRIP' ] || 'strip'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -113,7 +113,7 @@ begin
     s.extra_rdoc_files = []
     s.rdoc_options = %w{--no-private}
     s.add_dependency %<malloc>, [ '~> 1.1' ]
-    s.add_dependency %<multiarray>, [ '~> 0.5' ]
+    s.add_dependency %<multiarray>, [ '~> 0.6' ]
     s.add_development_dependency %q{rake}
   end
   GEM_SOURCE = "#{PKG_NAME}-#{PKG_VERSION}.gem"
@@ -135,7 +135,7 @@ begin
     s.extra_rdoc_files = []
     s.rdoc_options = %w{--no-private}
     s.add_dependency %q<malloc>, [ '~> 1.1' ]
-    s.add_dependency %<multiarray>, [ '~> 0.5' ]
+    s.add_dependency %<multiarray>, [ '~> 0.6' ]
   end
   GEM_BINARY = "#{PKG_NAME}-#{PKG_VERSION}-#{$BINSPEC.platform}.gem"
   desc "Build the gem file #{GEM_SOURCE}"
@@ -166,8 +166,11 @@ rule '.o' => '.cc' do |t|
    sh "#{CXX} #{$CXXFLAGS} -c -o #{t.name} #{t.source}"
 end
 
-# file 'ext/error.o' => [ 'ext/error.cc', 'ext/error.hh' ]
-# file 'ext/malloc.o' => [ 'ext/malloc.cc', 'ext/malloc.hh', 'ext/error.hh' ]
+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' ]
 
 CLEAN.include 'ext/*.o'
 CLOBBER.include SO_FILE, 'doc', '.yardoc'

data/ext/colourspace.cc

@@ -0,0 +1,77 @@
+/* HornetsEye - Computer Vision with Ruby
+   Copyright (C) 2006, 2007, 2008, 2009, 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/>. */
+extern "C" {
+  #include <libswscale/swscale.h>
+}
+#undef RSHIFT
+#include "colourspace.hh"
+
+using namespace std;
+
+static enum PixelFormat stringToPixelFormat( const string &str ) 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 << "\"" );
+  };
+  return retVal;
+}
+
+FramePtr frameToType( const FramePtr in, const string &target ) throw (Error)
+{
+  int
+    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 ),
+                                           SWS_FAST_BILINEAR, 0, 0, 0 );
+  sws_scale( swsContext, sourceData, sourceLineSize, 0,
+             height, destData, destLineSize );
+  sws_freeContext( swsContext );
+  return retVal;
+}
+
+VALUE frameWrapToType( VALUE rbSelf, VALUE rbTarget )
+{
+  VALUE rbRetVal = Qnil;
+  try {
+    FramePtr frame( new Frame( rbSelf ) );
+    VALUE rbString = rb_funcall( rbTarget, rb_intern( "to_s" ), 0 );
+    rbRetVal = frameToType( frame, StringValuePtr( rbString ) )->rubyObject();
+  } catch ( exception &e ) {
+    rb_raise( rb_eRuntimeError, "%s", e.what() );
+  };
+  return rbRetVal;
+}

data/ext/colourspace.hh

@@ -0,0 +1,29 @@
+/* HornetsEye - Computer Vision with Ruby
+   Copyright (C) 2006, 2007, 2008, 2009, 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/>. */
+#ifndef COLOURSPACE_HH
+#define COLOURSPACE_HH
+
+#include <ruby.h>
+#include <string>
+#include "error.hh"
+#include "frame.hh"
+
+FramePtr frameToType( const FramePtr in, const std::string &target ) throw (Error);
+
+VALUE frameWrapToType( VALUE rbClass, VALUE rbTarget );
+
+#endif
+

data/ext/error.hh

@@ -0,0 +1,50 @@
+/* HornetsEye - Computer Vision with Ruby
+   Copyright (C) 2006, 2007, 2008, 2009, 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/>. */
+#ifndef ERROR_HH
+#define ERROR_HH
+
+#include <exception>
+#include <sstream>
+
+class Error: public std::exception
+{
+public:
+  Error(void) {}
+  Error( Error &e ): std::exception( e )
+    { m_message << e.m_message.str(); }
+  virtual ~Error(void) throw() {}
+  template< typename T >
+  std::ostream &operator<<( const T &t )
+    { m_message << t; return m_message; }
+  std::ostream &operator<<( std::ostream& (*__pf)(std::ostream&) )
+    { (*__pf)( m_message ); return m_message; }
+  virtual const char* what(void) const throw() {
+    temp = m_message.str();
+    return temp.c_str();
+  }
+protected:
+  std::ostringstream m_message;
+  mutable std::string temp;
+};
+
+#define ERRORMACRO( condition, class, params, message ) \
+  if ( !( condition ) ) {                               \
+    class _e params;                                    \
+    _e << message;                                      \
+    throw _e;                                           \
+  };
+
+#endif

data/ext/frame.cc

@@ -0,0 +1,64 @@
+/* HornetsEye - Computer Vision with Ruby
+   Copyright (C) 2006, 2007, 2008, 2009, 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/>. */
+#include "frame.hh"
+
+using namespace std;
+
+Frame::Frame( const string &typecode, int width, int height, char *data ):
+  m_frame( Qnil )
+{
+  VALUE mModule = rb_define_module( "Hornetseye" );
+  VALUE cMalloc = rb_define_class_under( mModule, "Malloc", rb_cObject );
+  VALUE cFrame = rb_define_class_under( mModule, "Frame", rb_cObject );
+  VALUE rbSize = rb_funcall( cFrame, rb_intern( "storage_size" ), 3,
+                             rb_const_get( mModule, rb_intern( typecode.c_str() ) ),
+                             INT2NUM( width ), INT2NUM( height ) );
+  VALUE rbMemory;
+  if ( data != NULL ) {
+    rbMemory = Data_Wrap_Struct( cMalloc, 0, 0, (void *)data );
+    rb_ivar_set( rbMemory, rb_intern( "@size" ), rbSize );
+  } else
+    rbMemory = rb_funcall( cMalloc, rb_intern( "new" ), 1, rbSize );
+  m_frame = rb_funcall( cFrame, rb_intern( "import" ), 4,
+                        rb_const_get( mModule, rb_intern( typecode.c_str() ) ),
+                        INT2NUM( width ), INT2NUM( height ), rbMemory );
+}
+
+string Frame::typecode(void)
+{
+  VALUE rbString = rb_funcall( rb_funcall( m_frame, rb_intern( "typecode" ), 0 ),
+                               rb_intern( "to_s" ), 0 );
+  return StringValuePtr( rbString );
+}
+
+int Frame::width(void)
+{
+  return NUM2INT( rb_funcall( m_frame, rb_intern( "width" ), 0 ) );
+}
+
+int Frame::height(void)
+{
+  return NUM2INT( rb_funcall( m_frame, rb_intern( "height" ), 0 ) );
+}
+
+char *Frame::data(void)
+{
+  VALUE rbMemory = rb_funcall( m_frame, rb_intern( "memory" ), 0 );
+  char *ptr;
+  Data_Get_Struct( rbMemory, char, ptr );
+  return ptr;
+}
+

data/ext/frame.hh

@@ -0,0 +1,40 @@
+/* HornetsEye - Computer Vision with Ruby
+   Copyright (C) 2006, 2007, 2008, 2009, 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/>. */
+#ifndef FRAME_HH
+#define FRAME_HH
+
+#include <boost/smart_ptr.hpp>
+#include <ruby.h>
+#include <string>
+
+class Frame
+{
+public:
+  Frame( const std::string &typecode, int width, int height, char *data = NULL );
+  Frame( VALUE rbFrame ): m_frame( rbFrame ) {}
+  virtual ~Frame(void) {}
+  std::string typecode(void);
+  int width(void);
+  int height(void);
+  char *data(void);
+  VALUE rubyObject(void) { return m_frame; }
+protected:
+  VALUE m_frame;
+};
+
+typedef boost::shared_ptr< Frame > FramePtr;
+
+#endif

data/ext/init.cc

@@ -14,6 +14,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 "colourspace.hh"
 
 #ifdef WIN32
 #define DLLEXPORT __declspec(dllexport)
@@ -30,6 +31,8 @@ extern "C" {
   void Init_hornetseye_frame(void)
   {
     VALUE rbHornetseye = rb_define_module( "Hornetseye" );
+    VALUE cFrame = rb_define_class_under( rbHornetseye, "Frame_", rb_cObject );
+    rb_define_method( cFrame, "to_type", RUBY_METHOD_FUNC( frameWrapToType ), 1 );
     rb_require( "hornetseye_frame_ext.rb" );
   }
 

data/lib/hornetseye-frame/fourcc.rb

@@ -50,7 +50,7 @@ module Hornetseye
   BGR  = FourCC 'R', 'G', 'B', ' '
   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

@@ -0,0 +1,121 @@
+# 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 Frame_
+
+    class << self
+
+      attr_accessor :typecode, :width, :height
+
+      def inspect
+        to_s
+      end
+
+      def to_s
+        "Frame(#{typecode},#{@width},#{@height})"
+      end
+
+      def shape
+        [ @width, @height ]
+      end
+
+      def storage_size
+        case typecode
+        when BGR
+          width * height * 3
+        when UYVY
+          width * height * 2
+        when YUY2
+          widtha = ( width + 3 ) & ~0x3
+          widtha * height * 2
+        when YV12
+          width * height * 3 / 2
+        when MJPG
+          width * height * 2
+        else
+          raise "Memory size of #{inspect} is not known"
+        end
+      end
+
+    end
+
+    attr_reader :memory
+
+    def initialize( value = nil )
+      @memory = value || Malloc.new( self.class.storage_size )
+    end
+
+    def inspect
+      "#{self.class.inspect}(#{ "0x%08x" % @memory.object_id })"
+    end
+
+    def typecode
+      self.class.typecode
+    end
+
+    def shape
+      self.class.shape
+    end
+
+    def width
+      self.class.width
+    end
+
+    def height
+      self.class.height
+    end
+
+  end
+
+  def Frame( typecode, width, height )
+    if typecode.is_a? FourCC
+      retval = Class.new Frame_
+      retval.typecode = typecode
+      retval.width = width
+      retval.height = height
+      retval
+    else
+      Hornetseye::MultiArray typecode, width, height
+    end
+  end
+
+  module_function :Frame
+
+  class Frame
+
+    class << self
+
+      def new( typecode, width, height )
+        Hornetseye::Frame( typecode, width, height ).new
+      end
+
+      def import( typecode, width, height, memory )
+        Hornetseye::Frame( typecode, width, height ).new memory
+      end
+
+      def storage_size( typecode, width, height )
+        Hornetseye::Frame( typecode, width, height ).storage_size
+      end
+
+    end
+
+  end
+
+end
+

data/lib/hornetseye_frame_ext.rb

@@ -14,6 +14,8 @@
 # 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 'malloc'
 require 'multiarray'
 require 'hornetseye-frame/fourcc'
+require 'hornetseye-frame/frame'
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-24 00:00:00 +01:00
+date: 2010-09-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,8 +41,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 5
-        version: "0.5"
+        - 6
+        version: "0.6"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -72,8 +72,14 @@ files:
 - COPYING
 - .document
 - lib/hornetseye-frame/fourcc.rb
+- lib/hornetseye-frame/frame.rb
 - lib/hornetseye_frame_ext.rb
 - ext/init.cc
+- ext/frame.cc
+- ext/colourspace.cc
+- ext/frame.hh
+- ext/colourspace.hh
+- ext/error.hh
 has_rdoc: yard
 homepage: http://wedesoft.github.com/hornetseye-frame/
 licenses: []