hornetseye-ffmpeg 0.10.0 → 0.11.0

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-ffmpeg'
-PKG_VERSION = '0.10.0'
+PKG_VERSION = '0.11.0'
 CFG = RbConfig::CONFIG
 CXX = ENV[ 'CXX' ] || 'g++'
 RB_FILES = FileList[ 'lib/**/*.rb' ]

data/ext/avinput.cc

@@ -52,20 +52,27 @@ AVInput::AVInput( const string &mrl, bool audio ) throw (Error):
     cerr << "Video stream index is " << m_videoStream << endl;
     cerr << "Audio stream index is " << m_audioStream << endl;
 #endif
-    ERRORMACRO( m_videoStream >= 0, Error, ,
-                "Could not find video stream in file \"" << mrl << "\"" );
-    m_videoDec = m_ic->streams[ m_videoStream ]->codec;
+    if ( m_videoStream >= 0 )
+      m_videoDec = m_ic->streams[ m_videoStream ]->codec;
+    if ( m_videoDec != NULL ) {
+      m_videoCodec = avcodec_find_decoder( m_videoDec->codec_id );
+      ERRORMACRO( m_videoCodec != NULL, Error, , "Could not find video decoder for "
+                  "file \"" << mrl << "\"" );
+      err = avcodec_open( m_videoDec, m_videoCodec );
+      if ( err < 0 ) {
+        m_videoCodec = NULL;
+        ERRORMACRO( false, Error, , "Error opening video codec for file \""
+                    << mrl << "\": " << strerror( errno ) );
+      };
+      m_swsContext = sws_getContext( m_videoDec->width, m_videoDec->height,
+                                     m_videoDec->pix_fmt,
+                                     m_videoDec->width, m_videoDec->height,
+                                     PIX_FMT_YUV420P, SWS_FAST_BILINEAR, 0, 0, 0 );
+      m_avFrame = avcodec_alloc_frame();
+      ERRORMACRO( m_avFrame, Error, , "Error allocating frame" );
+    };
     if ( m_audioStream >= 0 )
       m_audioDec = m_ic->streams[ m_audioStream ]->codec;
-    m_videoCodec = avcodec_find_decoder( m_videoDec->codec_id );
-    ERRORMACRO( m_videoCodec != NULL, Error, , "Could not find video decoder for "
-                "file \"" << mrl << "\"" );
-    err = avcodec_open( m_videoDec, m_videoCodec );
-    if ( err < 0 ) {
-      m_videoCodec = NULL;
-      ERRORMACRO( false, Error, , "Error opening video codec for file \""
-                  << mrl << "\": " << strerror( errno ) );
-    };
     if ( m_audioDec != NULL ) {
       m_audioCodec = avcodec_find_decoder( m_audioDec->codec_id );
       ERRORMACRO( m_audioCodec != NULL, Error, , "Could not find audio decoder for "
@@ -77,12 +84,6 @@ AVInput::AVInput( const string &mrl, bool audio ) throw (Error):
                     << mrl << "\": " << strerror( errno ) );
       };
     };
-    m_swsContext = sws_getContext( m_videoDec->width, m_videoDec->height,
-                                   m_videoDec->pix_fmt,
-                                   m_videoDec->width, m_videoDec->height,
-                                   PIX_FMT_YUV420P, SWS_FAST_BILINEAR, 0, 0, 0 );
-    m_avFrame = avcodec_alloc_frame();
-    ERRORMACRO( m_avFrame, Error, , "Error allocating frame" );
   } catch ( Error &e ) {
     close();
     throw e;
@@ -228,6 +229,11 @@ int AVInput::height(void) const throw (Error)
   return m_videoDec->height;
 }
 
+bool AVInput::hasVideo(void) const
+{
+  return m_videoStream != -1;
+}
+
 bool AVInput::hasAudio(void) const
 {
   return m_audioStream != -1;
@@ -346,6 +352,7 @@ VALUE AVInput::registerRubyClass( VALUE rbModule )
   rb_define_method( cRubyClass, "width", RUBY_METHOD_FUNC( wrapWidth ), 0 );
   rb_define_method( cRubyClass, "height", RUBY_METHOD_FUNC( wrapHeight ), 0 );
   rb_define_method( cRubyClass, "has_audio?", RUBY_METHOD_FUNC( wrapHasAudio ), 0 );
+  rb_define_method( cRubyClass, "has_video?", RUBY_METHOD_FUNC( wrapHasVideo ), 0 );
   rb_define_method( cRubyClass, "seek", RUBY_METHOD_FUNC( wrapSeek ), 1 );
   rb_define_method( cRubyClass, "video_pts", RUBY_METHOD_FUNC( wrapVideoPTS ), 0 );
   rb_define_method( cRubyClass, "audio_pts", RUBY_METHOD_FUNC( wrapAudioPTS ), 0 );
@@ -546,6 +553,12 @@ VALUE AVInput::wrapHeight( VALUE rbSelf )
   return retVal;
 }
 
+VALUE AVInput::wrapHasVideo( VALUE rbSelf )
+{
+  AVInputPtr *self; Data_Get_Struct( rbSelf, AVInputPtr, self );
+  return (*self)->hasVideo() ? Qtrue : Qfalse;
+}
+
 VALUE AVInput::wrapHasAudio( VALUE rbSelf )
 {
   AVInputPtr *self; Data_Get_Struct( rbSelf, AVInputPtr, self );

data/ext/avinput.hh

@@ -48,6 +48,7 @@ public:
   bool status(void) const;
   int width(void) const throw (Error);
   int height(void) const throw (Error);
+  bool hasVideo(void) const;
   bool hasAudio(void) const;
   AVRational videoTimeBase(void) throw (Error);
   AVRational audioTimeBase(void) throw (Error);
@@ -80,6 +81,7 @@ public:
   static VALUE wrapAudioStartTime( VALUE rbSelf );
   static VALUE wrapWidth( VALUE rbSelf );
   static VALUE wrapHeight( VALUE rbSelf );
+  static VALUE wrapHasVideo( VALUE rbSelf );
   static VALUE wrapHasAudio( VALUE rbSelf );
   static VALUE wrapSeek( VALUE rbSelf, VALUE rbPos );
   static VALUE wrapVideoPTS( VALUE rbSelf );

data/lib/hornetseye-ffmpeg/avinput.rb

@@ -47,7 +47,9 @@ module Hornetseye
       frame
     end
 
-    alias_method :read, :read_video
+    def read
+      has_video? ? read_video : read_audio
+    end
 
     def read_audio
       enqueue_frame while @audio.empty?

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: hornetseye-ffmpeg
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 10
-  - 0
-  version: 0.10.0
+  prerelease: 
+  version: 0.11.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-29 00:00:00 +01:00
-default_executable: 
+date: 2011-08-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: malloc
@@ -25,9 +20,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
         version: "1.2"
   type: :runtime
   version_requirements: *id001
@@ -39,9 +31,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 23
         version: "0.23"
   type: :runtime
   version_requirements: *id002
@@ -53,9 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 11
         version: "0.11"
   type: :runtime
   version_requirements: *id003
@@ -67,8 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -99,7 +83,6 @@ files:
 - ext/error.hh
 - ext/rubyinc.hh
 - ext/avoutput.hh
-has_rdoc: yard
 homepage: http://wedesoft.github.com/hornetseye-ffmpeg/
 licenses: []
 
@@ -114,21 +97,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: hornetseye
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Read/write video frames using libffmpeg