hornetseye-frame 0.8.0 → 0.8.1

data/Rakefile

@@ -8,15 +8,15 @@ require 'rbconfig'
 require 'tempfile'
 
 PKG_NAME = 'hornetseye-frame'
-PKG_VERSION = '0.8.0'
+PKG_VERSION = '0.8.1'
+CFG = RbConfig::CONFIG
 CXX = ENV[ 'CXX' ] || 'g++'
-STRIP = ENV[ 'STRIP' ] || 'strip'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
 CC_FILES = FileList[ 'ext/*.cc' ]
 HH_FILES = FileList[ 'ext/*.hh' ] + FileList[ 'ext/*.tcc' ]
 TC_FILES = FileList[ 'test/tc_*.rb' ]
 TS_FILES = FileList[ 'test/ts_*.rb' ]
-SO_FILE = "ext/#{PKG_NAME.tr '\-', '_'}.so"
+SO_FILE = "ext/#{PKG_NAME.tr '\-', '_'}.#{CFG[ 'DLEXT' ]}"
 PKG_FILES = [ 'Rakefile', 'README.md', 'COPYING', '.document' ] +
             RB_FILES + CC_FILES + HH_FILES + TS_FILES + TC_FILES
 BIN_FILES = [ 'README.md', 'COPYING', '.document', SO_FILE ] +
@@ -28,17 +28,18 @@ EMAIL = %q{jan@wedesoft.de}
 HOMEPAGE = %q{http://wedesoft.github.com/hornetseye-frame/}
 
 OBJ = CC_FILES.ext 'o'
-$CXXFLAGS = ENV[ 'CXXFLAGS' ] || ''
-$CXXFLAGS = "#{$CXXFLAGS} -fPIC -DNDEBUG -DHAVE_CONFIG_H"
-if RbConfig::CONFIG[ 'rubyhdrdir' ]
-  $CXXFLAGS = "#{$CXXFLAGS} -I#{RbConfig::CONFIG[ 'rubyhdrdir' ]} " +
-              "-I#{RbConfig::CONFIG[ 'rubyhdrdir' ]}/#{RbConfig::CONFIG[ 'arch' ]}"
+$CXXFLAGS = "-DNDEBUG -DHAVE_CONFIG_H #{CFG[ 'CPPFLAGS' ]} #{CFG[ 'CFLAGS' ]}"
+if CFG[ 'rubyhdrdir' ]
+  $CXXFLAGS = "#{$CXXFLAGS} -I#{CFG[ 'rubyhdrdir' ]} " + 
+              "-I#{CFG[ 'rubyhdrdir' ]}/#{CFG[ 'arch' ]}"
 else
-  $CXXFLAGS = "#{$CXXFLAGS} -I#{RbConfig::CONFIG[ 'archdir' ]}"
+  $CXXFLAGS = "#{$CXXFLAGS} -I#{CFG[ 'archdir' ]}"
 end
-$LIBRUBYARG = RbConfig::CONFIG[ 'LIBRUBYARG' ]
-$SITELIBDIR = RbConfig::CONFIG[ 'sitelibdir' ]
-$SITEARCHDIR = RbConfig::CONFIG[ 'sitearchdir' ]
+$LIBRUBYARG = "-L#{CFG[ 'libdir' ]} #{CFG[ 'LIBRUBYARG' ]} #{CFG[ 'LDFLAGS' ]} " +
+              "#{CFG[ 'SOLIBS' ]} #{CFG[ 'DLDLIBS' ]}"
+$SITELIBDIR = CFG[ 'sitelibdir' ]
+$SITEARCHDIR = CFG[ 'sitearchdir' ]
+$LDSHARED = CFG[ 'LDSHARED' ][ CFG[ 'LDSHARED' ].index( ' ' ) .. -1 ]
 
 task :default => :all
 
@@ -47,7 +48,6 @@ task :all => [ SO_FILE ]
 
 file SO_FILE => OBJ do |t|
    sh "#{CXX} -shared -o #{t.name} #{OBJ} -lswscale #{$LIBRUBYARG}"
-   sh "#{STRIP} --strip-all #{t.name}"
 end
 
 task :test => [ SO_FILE ]
@@ -208,7 +208,7 @@ rule '.o' => '.cc' do |t|
 end
 
 file ".depends.mf" => :config_h do |t|
-  sh "g++ -MM #{$CXXFLAGS} #{CC_FILES.join ' '} | " +
+  sh "g++ -MM #{CC_FILES.join ' '} | " +
     "sed -e :a -e N -e 's/\\n/\\$/g' -e ta | " +
     "sed -e 's/ *\\\\\\$ */ /g' -e 's/\\$/\\n/g' | sed -e 's/^/ext\\//' > #{t.name}"
 end

data/ext/colourspace.cc

@@ -59,13 +59,13 @@ static void setupFormat( const string &typecode, int width, int height, char *me
     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;
+    lineSize[ 1 ] = width2a;
+    lineSize[ 2 ] = width2a;
   } else if ( typecode == "I420" ) {
     *format = PIX_FMT_YUV420P;
     int
-      width2  = width / 2,
-      height2 = height / 2;
+      width2  = ( width  + 1 ) / 2,
+      height2 = ( height + 1 ) / 2;
     data[ 0 ] = (uint8_t *)memory;
     data[ 1 ] = (uint8_t *)memory + width * height;
     data[ 2 ] = (uint8_t *)data[ 1 ] + width2 * height2;
@@ -75,13 +75,12 @@ static void setupFormat( const string &typecode, int width, int height, char *me
   } 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;
+    int widtha = ( width + 3 ) & ~0x3;
     data[ 0 ] = (uint8_t *)memory;
     lineSize[ 0 ] = 2 * widtha;
   } else {

data/lib/hornetseye-frame/frame.rb

@@ -42,12 +42,17 @@ module Hornetseye
         when BGRA
           width * height * 4
         when UYVY
-          width * height * 2
+          widtha = ( width + 3 ) & ~0x3
+          widtha * height * 2
         when YUY2
           widtha = ( width + 3 ) & ~0x3
           widtha * height * 2
         when YV12
-          width * height * 3 / 2
+          width2  = ( width  + 1 ) / 2
+          height2 = ( height + 1 ) / 2
+          widtha  = ( width  + 7 ) & ~0x7
+          width2a = ( width2 + 7 ) & ~0x7
+          widtha * height + 2 * width2a * height2
         when I420
           width * height * 3 / 2
         when MJPG

data/test/tc_frame.rb

@@ -69,6 +69,13 @@ class TC_Frame < Test::Unit::TestCase
     assert_equal [ 320, 240 ], F( YV12, 320, 240 ).shape
   end
 
+  def test_frame_equal
+    assert_equal F( YV12, 320, 240 ), F( YV12, 320, 240 )
+    assert_not_equal F( YV12, 320, 240 ), F( YV12, 320, 200 )
+    assert_not_equal F( YV12, 320, 240 ), F( YV12, 240, 240 )
+    assert_not_equal F( YV12, 320, 240 ), F( I420, 320, 240 )
+  end
+
   def test_typecode
     assert_equal YV12, F.new( YV12, 320, 240 ).typecode
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-25 00:00:00 +01:00
+date: 2010-11-13 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency