hornetseye-ffmpeg 0.3.2 → 0.4.0

data/README.md

@@ -1,4 +1,4 @@
 Hornetseye-FFMPEG
 ======
-This Ruby extension defines the class {Hornetseye::AVInput} for reading frames from video files.
+This Ruby extension defines the class {Hornetseye::AVInput} for reading frames from video files and the class {Hornetseye::AVOutput} for writing frames to video files.
 

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-ffmpeg'
-PKG_VERSION = '0.3.2'
+PKG_VERSION = '0.4.0'
 CXX = ENV[ 'CXX' ] || 'g++'
 STRIP = ENV[ 'STRIP' ] || 'strip'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -21,7 +21,7 @@ PKG_FILES = [ 'Rakefile', 'README.md', 'COPYING', '.document' ] +
 BIN_FILES = [ 'README.md', 'COPYING', '.document', SO_FILE ] +
             RB_FILES + TS_FILES + TC_FILES
 SUMMARY = %q{Read/write video frames using libffmpeg}
-DESCRIPTION = %q{This Ruby extension defines the class Hornetseye::AVInput for reading frames from video files.}
+DESCRIPTION = %q{This Ruby extension defines the class Hornetseye::AVInput for reading frames from video files and the class Hornetseye::AVOutput for writing frames to video files.}
 AUTHOR = %q{Jan Wedekind}
 EMAIL = %q{jan@wedesoft.de}
 HOMEPAGE = %q{http://wedesoft.github.com/hornetseye-ffmpeg/}
@@ -171,7 +171,9 @@ rule '.o' => '.cc' do |t|
 end
 
 file ".depends.mf" do |t|
-  sh "makedepend -f- -- #{$CXXFLAGS} -- #{CC_FILES.join ' '} > #{t.name}"
+  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}"
 end
 CC_FILES.each do |t|
   file t.ext(".o") => t

data/ext/avinput.cc

@@ -159,6 +159,20 @@ AVRational AVInput::frameRate(void) throw (Error)
   return m_ic->streams[ m_idx ]->r_frame_rate;
 }
 
+long long AVInput::duration(void) throw (Error)
+{
+  ERRORMACRO( m_ic != NULL, Error, , "Video \"" << m_mrl << "\" is not open. "
+              "Did you call \"close\" before?" );
+  return m_ic->streams[ m_idx ]->duration;
+}
+
+long long AVInput::startTime(void) throw (Error)
+{
+  ERRORMACRO( m_ic != NULL, Error, , "Video \"" << m_mrl << "\" is not open. "
+              "Did you call \"close\" before?" );
+  return m_ic->streams[ m_idx ]->start_time;
+}
+
 void AVInput::seek( long timestamp ) throw (Error)
 {
   ERRORMACRO( m_ic != NULL, Error, , "Video \"" << m_mrl << "\" is not open. "
@@ -185,6 +199,8 @@ VALUE AVInput::registerRubyClass( VALUE rbModule )
   rb_define_method( cRubyClass, "read", RUBY_METHOD_FUNC( wrapRead ), 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 );
+  rb_define_method( cRubyClass, "start_time", RUBY_METHOD_FUNC( wrapStartTime ), 0 );
   rb_define_method( cRubyClass, "width", RUBY_METHOD_FUNC( wrapWidth ), 0 );
   rb_define_method( cRubyClass, "height", RUBY_METHOD_FUNC( wrapHeight ), 0 );
   rb_define_method( cRubyClass, "seek", RUBY_METHOD_FUNC( wrapSeek ), 1 );
@@ -258,6 +274,30 @@ VALUE AVInput::wrapFrameRate( VALUE rbSelf )
   return retVal;
 }
 
+VALUE AVInput::wrapDuration( VALUE rbSelf )
+{
+  VALUE retVal = Qnil;
+  try {
+    AVInputPtr *self; Data_Get_Struct( rbSelf, AVInputPtr, self );
+    retVal = LL2NUM( (*self)->duration() );
+  } catch( exception &e ) {
+    rb_raise( rb_eRuntimeError, "%s", e.what() );
+  };
+  return retVal;
+}
+
+VALUE AVInput::wrapStartTime( VALUE rbSelf )
+{
+  VALUE retVal = Qnil;
+  try {
+    AVInputPtr *self; Data_Get_Struct( rbSelf, AVInputPtr, self );
+    retVal = LL2NUM( (*self)->startTime() );
+  } catch( exception &e ) {
+    rb_raise( rb_eRuntimeError, "%s", e.what() );
+  };
+  return retVal;
+}
+
 VALUE AVInput::wrapWidth( VALUE rbSelf )
 {
   VALUE retVal = Qnil;

data/ext/avinput.hh

@@ -36,6 +36,8 @@ public:
   int height(void) const throw (Error);
   AVRational timeBase(void) throw (Error);
   AVRational frameRate(void) throw (Error);
+  long long duration(void) throw (Error);
+  long long startTime(void) throw (Error);
   void seek( long timestamp ) throw (Error);
   long long pts(void) throw (Error);
   static VALUE cRubyClass;
@@ -46,6 +48,8 @@ public:
   static VALUE wrapRead( VALUE rbSelf );
   static VALUE wrapTimeBase( VALUE rbSelf );
   static VALUE wrapFrameRate( VALUE rbSelf );
+  static VALUE wrapDuration( VALUE rbSelf );
+  static VALUE wrapStartTime( VALUE rbSelf );
   static VALUE wrapWidth( VALUE rbSelf );
   static VALUE wrapHeight( VALUE rbSelf );
   static VALUE wrapSeek( VALUE rbSelf, VALUE rbPos );

data/lib/hornetseye-ffmpeg/avinput.rb

@@ -55,6 +55,18 @@ module Hornetseye
       pts * time_base
     end
 
+    alias_method :orig_duration, :duration
+
+    def duration
+      orig_duration * time_base
+    end
+
+    alias_method :orig_start_time, :start_time
+
+    def start_time
+      orig_start_time * time_base
+    end
+
   end
 
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 +01:00
+date: 2010-10-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,7 +72,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
-description: This Ruby extension defines the class Hornetseye::AVInput for reading frames from video files.
+description: This Ruby extension defines the class Hornetseye::AVInput for reading frames from video files and the class Hornetseye::AVOutput for writing frames to video files.
 email: jan@wedesoft.de
 executables: []