hornetseye-qt4 0.1.0 → 0.1.1

data/Rakefile

@@ -7,15 +7,15 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-qt4'
-PKG_VERSION = '0.1.0'
+PKG_VERSION = '0.1.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 ] +
@@ -27,17 +27,18 @@ EMAIL = %q{jan@wedesoft.de}
 HOMEPAGE = %q{http://wedesoft.github.com/hornetseye-qt4/}
 
 OBJ = CC_FILES.ext 'o'
-$CXXFLAGS = ENV[ 'CXXFLAGS' ] || ''
-$CXXFLAGS = "#{$CXXFLAGS} -fPIC -DNDEBUG -DQT_SHARED -I/usr/include/qt4"
-if RbConfig::CONFIG[ 'rubyhdrdir' ]
-  $CXXFLAGS = "#{$CXXFLAGS} -I#{RbConfig::CONFIG[ 'rubyhdrdir' ]} " +
-             "-I#{RbConfig::CONFIG[ 'rubyhdrdir' ]}/#{RbConfig::CONFIG[ 'arch' ]}"
+$CXXFLAGS = "-DNDEBUG -DHAVE_CONFIG_H -D__STDC_CONSTANT_MACROS #{CFG[ 'CPPFLAGS' ]} #{CFG[ 'CFLAGS' ]} -I/usr/include/qt4"
+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
 
@@ -45,8 +46,7 @@ desc 'Compile Ruby extension (default)'
 task :all => [ SO_FILE ]
 
 file SO_FILE => OBJ do |t|
-   sh "#{CXX} -shared -o #{t.name} #{OBJ} -lX11 -lXv -lQtGui -lQtCore #{$LIBRUBYARG}"
-   sh "#{STRIP} --strip-all #{t.name}"
+   sh "#{CXX} -shared -o #{t.name} #{OBJ} -lswscale -lX11 -lXv -lQtGui -lQtCore #{$LIBRUBYARG}"
 end
 
 task :test => [ SO_FILE ]
@@ -73,6 +73,45 @@ task :uninstall do
   end
 end
 
+desc 'Create config.h'
+task :config_h => 'ext/config.h'
+
+def check_program
+  f_base_name = 'rakeconf'
+  begin
+    File.open( "#{f_base_name}.cc", 'w' ) { |f| yield f }
+    `#{CXX} -S #{$CXXFLAGS} -c -o #{f_base_name}.o #{f_base_name}.cc 2>&1 >> rake.log`
+    $?.exitstatus == 0
+  ensure
+    File.delete *Dir.glob( "#{f_base_name}.*" )
+  end
+end
+
+def check_c_header( name )
+  check_program do |c|
+    c.puts <<EOS
+extern "C" {
+  #include <#{name}>
+}
+int main(void) { return 0; }
+EOS
+  end
+end
+
+file 'ext/config.h' do |t|
+  s = "/* config.h. Generated from Rakefile by rake. */\n"
+  # need to compile with -D__STDC_CONSTANT_MACROS
+  if check_c_header 'libswscale/swscale.h'
+    s << "#define HAVE_LIBSWSCALE_INCDIR 1\n"
+  else
+    unless check_c_header 'ffmpeg/swscale.h'
+      raise 'Cannot find swscale.h header file'
+    end
+    s << "#undef HAVE_LIBSWSCALE_INCDIR\n"
+  end
+  File.open( t.name, 'w' ) { |f| f.puts s }
+end
+
 Rake::TestTask.new do |t|
   t.libs << 'ext'
   t.test_files = TC_FILES
@@ -172,8 +211,8 @@ rule '.o' => '.cc' do |t|
    sh "#{CXX} #{$CXXFLAGS} -c -o #{t.name} #{t.source}"
 end
 
-file ".depends.mf" do |t|
-  sh "g++ -MM #{$CXXFLAGS} #{CC_FILES.join ' '} | " +
+file ".depends.mf" => :config_h do |t|
+  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
@@ -183,5 +222,5 @@ end
 import ".depends.mf"
 
 CLEAN.include 'ext/*.o'
-CLOBBER.include SO_FILE, 'doc', '.yardoc', '.depends.mf'
+CLOBBER.include SO_FILE, 'doc', '.yardoc', '.depends.mf', 'ext/config.h'
 

data/ext/xvwidget.cc

@@ -13,6 +13,16 @@
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+extern "C" {
+#ifndef HAVE_LIBSWSCALE_INCDIR
+  #include <ffmpeg/swscale.h>
+#else
+  #include <libswscale/swscale.h>
+#endif
+}
 #ifndef NDEBUG
 #include <iostream>
 #include <iomanip>
@@ -325,38 +335,28 @@ FramePtr XvManager::alignYV12( FramePtr frame )
 #endif
     FramePtr dest( new Frame( "YV12",
                               m_xvImage->width, m_xvImage->height ) );
-    const char
-      *src_y = frame->data();
-    const signed char
-      *src_v = (const signed char *)src_y + widtha * height,
-      *src_u = src_v + width2a * height2;
-    unsigned char
-      *dest_y = (unsigned char *)dest->data();
-    signed char
-      *dest_v = (signed char *)dest_y + m_xvImage->offsets[1],
-      *dest_u = (signed char *)dest_y + m_xvImage->offsets[2];
-    for ( int y=0; y<height; y+=2 ) {
-      for ( int x=0; x<width; x+=2 ) {
-        dest_y[      0] = src_y[       0];
-        dest_y[      1] = src_y[       1];
-        dest_y[m_xvImage->pitches[0]  ] = src_y[widtha  ];
-        dest_y[m_xvImage->pitches[0]+1] = src_y[widtha+1];
-        *dest_v = *src_v;
-        *dest_u = *src_u;
-        src_y += 2;
-        src_u++;
-        src_v++;
-        dest_y += 2;
-        dest_u++;
-        dest_v++;
-      };
-      src_y += 2 * widtha - width;
-      src_v += width2a - width2;
-      src_u += width2a - width2;
-      dest_y += 2 * m_xvImage->pitches[0] - width;
-      dest_v += m_xvImage->pitches[1] - width2;
-      dest_u += m_xvImage->pitches[2] - width2;
-    };
+    uint8_t *sourceData[4];
+    int sourceLineSize[4];
+    sourceData[0] = (uint8_t *)frame->data();
+    sourceData[2] = (uint8_t *)frame->data() + widtha * height;
+    sourceData[1] = (uint8_t *)sourceData[2] + width2a * height2;
+    sourceLineSize[0] = widtha;
+    sourceLineSize[1] = width2a;
+    sourceLineSize[2] = width2a;
+    uint8_t *destData[4];
+    int destLineSize[4];
+    destData[0] = (uint8_t *)dest->data();
+    destData[2] = (uint8_t *)dest->data() + m_xvImage->offsets[1];
+    destData[1] = (uint8_t *)dest->data() + m_xvImage->offsets[2];
+    destLineSize[0] = m_xvImage->pitches[0];
+    destLineSize[1] = m_xvImage->pitches[2];
+    destLineSize[2] = m_xvImage->pitches[1];
+    SwsContext *swsContext = sws_getContext( width, height, PIX_FMT_YUV420P,
+                                             width, height, PIX_FMT_YUV420P,
+                                             SWS_FAST_BILINEAR, 0, 0, 0 );
+    sws_scale( swsContext, sourceData, sourceLineSize, 0,
+               height, destData, destLineSize );
+    sws_freeContext( swsContext );
     retVal = dest;
   } else
     retVal = frame;

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 +01:00
+date: 2010-12-21 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency