hornetseye-ffmpeg 0.4.0 → 0.4.1

data/Rakefile

@@ -7,12 +7,12 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-ffmpeg'
-PKG_VERSION = '0.4.0'
+PKG_VERSION = '0.4.1'
 CXX = ENV[ 'CXX' ] || 'g++'
 STRIP = ENV[ 'STRIP' ] || 'strip'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
 CC_FILES = FileList[ 'ext/*.cc' ]
-HH_FILES = FileList[ 'ext/*.hh' ]
+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"
@@ -28,7 +28,7 @@ HOMEPAGE = %q{http://wedesoft.github.com/hornetseye-ffmpeg/}
 
 OBJ = CC_FILES.ext 'o'
 $CXXFLAGS = ENV[ 'CXXFLAGS' ] || ''
-$CXXFLAGS = "#{$CXXFLAGS} -fPIC -DNDEBUG"
+$CXXFLAGS = "#{$CXXFLAGS} -fPIC -DNDEBUG -DHAVE_CONFIG_H"
 if RbConfig::CONFIG[ 'rubyhdrdir' ]
   $CXXFLAGS = "#{$CXXFLAGS} -I#{RbConfig::CONFIG[ 'rubyhdrdir' ]} " +
              "-I#{RbConfig::CONFIG[ 'rubyhdrdir' ]}/#{RbConfig::CONFIG[ 'arch' ]}"
@@ -73,6 +73,99 @@ 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"
+  if check_c_header 'libswscale/swscale.h'
+    s << "#define HAVE_LIBSWSCALE_INCDIR 1\n"
+  elsif check_c_header 'ffmpeg/swscale.h'
+    s << "#undef HAVE_LIBSWSCALE_INCDIR\n"
+  else
+    raise 'Cannot find swscale.h header file'
+  end
+  have_libavformat_incdir = check_c_header 'libavformat/avformat.h'
+  if have_libavformat_incdir
+    s << "#define HAVE_LIBAVFORMAT_INCDIR 1\n"
+  elsif check_c_header 'ffmpeg/avformat.h'
+    s << "#undef HAVE_LIBAVFORMAT_INCDIR\n"
+  else
+    raise 'Cannot find swscale.h header file'
+  end
+  have_libavformat_alloc_context = check_program do |c|
+    c.puts <<EOS
+extern "C" {
+  #include <#{have_libavformat_incdir ? 'libavformat' : 'ffmpeg'}/avformat.h>
+}
+int main(void) { avformat_alloc_context(); return 0; }
+EOS
+  end
+  if have_libavformat_alloc_context
+    s << "#define HAVE_LIBAVFORMAT_ALLOC_CONTEXT 1\n"
+  else
+    have_alloc_format_context = check_program do |c|
+      c.puts <<EOS
+extern "C" {
+  #include <#{have_libavformat_incdir ? 'libavformat' : 'ffmpeg'}/avformat.h>
+}
+int main(void) { av_alloc_format_context(); return 0; }
+EOS
+    end
+    unless have_alloc_format_context
+      raise 'Cannot find constructor for AVFormatContext'
+    end
+    s << "#undef HAVE_LIBAVFORMAT_ALLOC_CONTEXT\n"
+  end
+  have_byteio_ptr = check_program do |c|
+    c.puts <<EOS
+extern "C" {
+  #include <#{have_libavformat_incdir ? 'libavformat' : 'ffmpeg'}/avformat.h>
+}
+int main(void) { AVFormatContext *c; url_fclose( c->pb ); return 0; }
+EOS
+  end
+  if have_byteio_ptr
+    s << "#define HAVE_BYTEIO_PTR 1\n"
+  else
+    have_byteio_inst = check_program do |c|
+      c.puts <<EOS
+extern "C" {
+  #include <#{have_libavformat_incdir ? 'libavformat' : 'ffmpeg'}/avformat.h>
+}
+int main(void) { AVFormatContext *c; url_fclose( &c->pb ); return 0; }
+EOS
+    end
+    unless have_byteio_inst
+      raise 'Cannot find ByteIOContext member variable'
+    end
+    s << "#undef HAVE_BYTEIO_PTR\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
@@ -170,7 +263,7 @@ rule '.o' => '.cc' do |t|
    sh "#{CXX} #{$CXXFLAGS} -c -o #{t.name} #{t.source}"
 end
 
-file ".depends.mf" do |t|
+file ".depends.mf" => :config_h do |t|
   sh "g++ -MM #{$CXXFLAGS} #{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}"
@@ -181,5 +274,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/avinput.cc

@@ -131,6 +131,11 @@ FramePtr AVInput::read(void) throw (Error)
   return retVal;
 }
 
+bool AVInput::status(void) const
+{
+  return m_ic != NULL;
+}
+
 int AVInput::width(void) const throw (Error)
 {
   ERRORMACRO( m_dec != NULL, Error, , "Video \"" << m_mrl << "\" is not open. "
@@ -197,6 +202,7 @@ VALUE AVInput::registerRubyClass( VALUE rbModule )
   rb_define_const( cRubyClass, "AV_TIME_BASE", INT2NUM( AV_TIME_BASE ) );
   rb_define_method( cRubyClass, "close", RUBY_METHOD_FUNC( wrapClose ), 0 );
   rb_define_method( cRubyClass, "read", RUBY_METHOD_FUNC( wrapRead ), 0 );
+  rb_define_method( cRubyClass, "status?", RUBY_METHOD_FUNC( wrapStatus ), 0 );
   rb_define_method( cRubyClass, "time_base", RUBY_METHOD_FUNC( wrapTimeBase ), 0 );
   rb_define_method( cRubyClass, "frame_rate", RUBY_METHOD_FUNC( wrapFrameRate ), 0 );
   rb_define_method( cRubyClass, "duration", RUBY_METHOD_FUNC( wrapDuration ), 0 );
@@ -246,6 +252,12 @@ VALUE AVInput::wrapRead( VALUE rbSelf )
   return retVal;
 }
 
+VALUE AVInput::wrapStatus( VALUE rbSelf )
+{
+  AVInputPtr *self; Data_Get_Struct( rbSelf, AVInputPtr, self );
+  return (*self)->status() ? Qtrue : Qfalse;
+}
+
 VALUE AVInput::wrapTimeBase( VALUE rbSelf )
 {
   VALUE retVal = Qnil;

data/ext/avinput.hh

@@ -16,10 +16,22 @@
 #ifndef AVINPUT_HH
 #define AVINPUT_HH
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <boost/shared_ptr.hpp>
 extern "C" {
+#ifdef HAVE_LIBSWSCALE_INCDIR
   #include <libswscale/swscale.h>
+#else
+  #include <ffmpeg/swscale.h>
+#endif
+#ifdef HAVE_LIBAVFORMAT_INCDIR
   #include <libavformat/avformat.h>
+#else
+  #include <ffmpeg/avformat.h>
+#endif
 }
 #include "rubyinc.hh"
 #include "error.hh"
@@ -32,6 +44,7 @@ public:
   virtual ~AVInput(void);
   void close(void);
   FramePtr read(void) throw (Error);
+  bool status(void) const;
   int width(void) const throw (Error);
   int height(void) const throw (Error);
   AVRational timeBase(void) throw (Error);
@@ -46,6 +59,7 @@ public:
   static VALUE wrapNew( VALUE rbClass, VALUE rbMRL );
   static VALUE wrapClose( VALUE rbSelf );
   static VALUE wrapRead( VALUE rbSelf );
+  static VALUE wrapStatus( VALUE rbSelf );
   static VALUE wrapTimeBase( VALUE rbSelf );
   static VALUE wrapFrameRate( VALUE rbSelf );
   static VALUE wrapDuration( VALUE rbSelf );

data/ext/avoutput.cc

@@ -37,7 +37,11 @@ AVOutput::AVOutput( const string &mrl, int bitrate, int width, int height,
     if ( format == NULL ) format = guess_format( "mpeg", NULL, NULL );
     ERRORMACRO( format != NULL, Error, ,
                 "Could not find suitable output format for \"" << mrl << "\""  );
+#ifdef HAVE_LIBAVFORMAT_ALLOC_CONTEXT
     m_oc = avformat_alloc_context();
+#else
+    m_oc = av_alloc_format_context();
+#endif
     ERRORMACRO( m_oc != NULL, Error, , "Failure allocating format context" );
     m_oc->oformat = format;
     snprintf( m_oc->filename, sizeof( m_oc->filename ), "%s", mrl.c_str() );
@@ -131,7 +135,11 @@ void AVOutput::close(void)
     };
     m_video_st = NULL;
     if ( m_file_open ) {
+#ifdef HAVE_BYTEIO_PTR
       url_fclose( m_oc->pb );
+#else
+      url_fclose( &m_oc->pb );
+#endif
       m_file_open = false;
     };
     av_free( m_oc );

data/ext/avoutput.hh

@@ -16,10 +16,22 @@
 #ifndef AVOUTPUT_HH
 #define AVOUTPUT_HH
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <boost/shared_ptr.hpp>
 extern "C" {
+#ifdef HAVE_LIBSWSCALE_INCDIR
   #include <libswscale/swscale.h>
+#else
+  #include <ffmpeg/swscale.h>
+#endif
+#ifdef HAVE_LIBAVFORMAT_INCDIR
   #include <libavformat/avformat.h>
+#else
+  #include <ffmpeg/avformat.h>
+#endif
 }
 #include "rubyinc.hh"
 #include "error.hh"

data/ext/frame.cc

@@ -23,9 +23,7 @@ Frame::Frame( const string &typecode, int width, int height, char *data ):
   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 rbSize = INT2NUM( storageSize( typecode, width, height ) );
   VALUE rbMemory;
   if ( data != NULL ) {
     rbMemory = Data_Wrap_Struct( cMalloc, 0, 0, (void *)data );
@@ -67,3 +65,12 @@ void Frame::markRubyMember(void)
   rb_gc_mark( m_frame );
 }
 
+int Frame::storageSize( const std::string &typecode, int width, int height )
+{
+  VALUE mModule = rb_define_module( "Hornetseye" );
+  VALUE cFrame = rb_define_class_under( mModule, "Frame", rb_cObject );
+  return NUM2INT( rb_funcall( cFrame, rb_intern( "storage_size" ), 3,
+                              rb_const_get( mModule, rb_intern( typecode.c_str() ) ),
+                              INT2NUM( width ), INT2NUM( height ) ) );
+}
+ 

data/ext/frame.hh

@@ -32,6 +32,7 @@ public:
   char *data(void);
   VALUE rubyObject(void) { return m_frame; }
   void markRubyMember(void);
+  static int storageSize( const std::string &typecode, int width, int height );
 protected:
   VALUE m_frame;
 };

metadata

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