hornetseye-ffmpeg 0.5.2 → 0.5.3

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-ffmpeg'
-PKG_VERSION = '0.5.2'
+PKG_VERSION = '0.5.3'
 CXX = ENV[ 'CXX' ] || 'g++'
 STRIP = ENV[ 'STRIP' ] || 'strip'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -33,7 +33,7 @@ if RbConfig::CONFIG[ 'rubyhdrdir' ]
   $CXXFLAGS = "#{$CXXFLAGS} -I#{RbConfig::CONFIG[ 'rubyhdrdir' ]} " +
              "-I#{RbConfig::CONFIG[ 'rubyhdrdir' ]}/#{RbConfig::CONFIG[ 'arch' ]}"
 else
-  $CXXFLAGS += "#{$CXXFLAGS} -I#{RbConfig::CONFIG[ 'archdir' ]}"
+  $CXXFLAGS = "#{$CXXFLAGS} -I#{RbConfig::CONFIG[ 'archdir' ]}"
 end
 $LIBRUBYARG = RbConfig::CONFIG[ 'LIBRUBYARG' ]
 $SITELIBDIR = RbConfig::CONFIG[ 'sitelibdir' ]
@@ -113,7 +113,7 @@ file 'ext/config.h' do |t|
   elsif check_c_header 'ffmpeg/avformat.h'
     s << "#undef HAVE_LIBAVFORMAT_INCDIR\n"
   else
-    raise 'Cannot find swscale.h header file'
+    raise 'Cannot find avformat.h header file'
   end
   have_libavformat_alloc_context = check_program do |c|
     c.puts <<EOS

data/ext/avinput.cc

@@ -241,6 +241,13 @@ AVRational AVInput::frameRate(void) throw (Error)
   return m_ic->streams[ m_videoStream ]->r_frame_rate;
 }
 
+AVRational AVInput::aspectRatio(void) throw (Error)
+{
+  ERRORMACRO( m_ic != NULL, Error, , "Video \"" << m_mrl << "\" is not open. "
+              "Did you call \"close\" before?" );
+  return m_ic->streams[ m_videoStream ]->sample_aspect_ratio;
+}
+
 int AVInput::sampleRate(void) throw (Error)
 {
   ERRORMACRO( m_audioDec != NULL, Error, , "Audio \"" << m_mrl << "\" is not open. "
@@ -307,6 +314,8 @@ VALUE AVInput::registerRubyClass( VALUE rbModule )
   rb_define_method( cRubyClass, "audio_time_base",
                     RUBY_METHOD_FUNC( wrapAudioTimeBase ), 0 );
   rb_define_method( cRubyClass, "frame_rate", RUBY_METHOD_FUNC( wrapFrameRate ), 0 );
+  rb_define_method( cRubyClass, "aspect_ratio",
+                    RUBY_METHOD_FUNC( wrapAspectRatio ), 0 );
   rb_define_method( cRubyClass, "sample_rate", RUBY_METHOD_FUNC( wrapSampleRate ), 0 );
   rb_define_method( cRubyClass, "channels", RUBY_METHOD_FUNC( wrapChannels ), 0 );
   rb_define_method( cRubyClass, "duration", RUBY_METHOD_FUNC( wrapDuration ), 0 );
@@ -415,6 +424,20 @@ VALUE AVInput::wrapFrameRate( VALUE rbSelf )
   return retVal;
 }
 
+VALUE AVInput::wrapAspectRatio( VALUE rbSelf )
+{
+  VALUE retVal = Qnil;
+  try {
+    AVInputPtr *self; Data_Get_Struct( rbSelf, AVInputPtr, self );
+    AVRational aspectRatio = (*self)->aspectRatio();
+    retVal = rb_funcall( rb_cObject, rb_intern( "Rational" ), 2,
+                         INT2NUM( aspectRatio.num ), INT2NUM( aspectRatio.den ) );
+  } catch( exception &e ) {
+    rb_raise( rb_eRuntimeError, "%s", e.what() );
+  };
+  return retVal;
+}
+
 VALUE AVInput::wrapSampleRate( VALUE rbSelf )
 {
   VALUE retVal = Qnil;

data/ext/avinput.hh

@@ -51,6 +51,7 @@ public:
   AVRational videoTimeBase(void) throw (Error);
   AVRational audioTimeBase(void) throw (Error);
   AVRational frameRate(void) throw (Error);
+  AVRational aspectRatio(void) throw (Error);
   int sampleRate(void) throw (Error);
   int channels(void) throw (Error);
   long long duration(void) throw (Error);
@@ -69,6 +70,7 @@ public:
   static VALUE wrapVideoTimeBase( VALUE rbSelf );
   static VALUE wrapAudioTimeBase( VALUE rbSelf );
   static VALUE wrapFrameRate( VALUE rbSelf );
+  static VALUE wrapAspectRatio( VALUE rbSelf );
   static VALUE wrapSampleRate( VALUE rbSelf );
   static VALUE wrapChannels( VALUE rbSelf );
   static VALUE wrapDuration( VALUE rbSelf );

data/lib/hornetseye-ffmpeg/avinput.rb

@@ -99,6 +99,12 @@ module Hornetseye
       orig_start_time == AV_NOPTS_VALUE ? nil : orig_start_time * video_time_base
     end
 
+    alias_method :orig_aspect_ratio, :aspect_ratio
+
+    def aspect_ratio
+      orig_aspect_ratio == 0 ? 1 : orig_aspect_ratio
+    end
+
   end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-20 00:00:00 +01:00
+date: 2010-10-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency