hornetseye-ffmpeg 0.1.0 → 0.2.0

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/packagetask'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-ffmpeg'
-PKG_VERSION = '0.1.0'
+PKG_VERSION = '0.2.0'
 CXX = ENV[ 'CXX' ] || 'g++'
 STRIP = ENV[ 'STRIP' ] || 'strip'
 RB_FILES = FileList[ 'lib/**/*.rb' ]

data/ext/avinput.cc

@@ -15,13 +15,19 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #include "avinput.hh"
 
+#if !defined(INT64_C)
+#define INT64_C(c) c ## LL
+#endif
+
+// Also see FFMPEG tutorial at http://dranger.com/ffmpeg/
+
 using namespace std;
 
 VALUE AVInput::cRubyClass = Qnil;
 
 AVInput::AVInput( const string &mrl ) throw (Error):
   m_mrl( mrl ), m_ic( NULL ), m_enc( NULL ), m_codec( NULL ), m_idx( -1 ),
-  m_frame( NULL )
+  m_pts( 0 ), m_frame( NULL )
 {
   try {
     int err = av_open_input_file( &m_ic, mrl.c_str(), NULL, 0, NULL );
@@ -86,7 +92,9 @@ FramePtr AVInput::read(void) throw (Error)
                                       packet.data, packet.size );
       ERRORMACRO( err >= 0, Error, ,
                   "Error decoding frame of video \"" << m_mrl << "\"" );
+
       if ( frameFinished ) {
+        if ( packet.dts != AV_NOPTS_VALUE ) m_pts = packet.dts;
         av_free_packet( &packet );
         AVFrame frame;
         m_data = boost::shared_array< char >( new char[ m_enc->width *
@@ -102,7 +110,7 @@ FramePtr AVInput::read(void) throw (Error)
         struct SwsContext *swsContext =
           sws_getContext( m_enc->width, m_enc->height, m_enc->pix_fmt,
                           m_enc->width, m_enc->height, PIX_FMT_YUV420P,
-                          SWS_BILINEAR, 0, 0, 0 );
+                          SWS_FAST_BILINEAR, 0, 0, 0 );
         sws_scale( swsContext, m_frame->data, m_frame->linesize, 0,
                    m_enc->height, frame.data, frame.linesize );
         sws_freeContext( swsContext );
@@ -117,13 +125,40 @@ FramePtr AVInput::read(void) throw (Error)
   return retVal;
 }
 
+AVRational AVInput::timeBase(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 ]->time_base;
+}
+
+void AVInput::seek( long timestamp ) throw (Error)
+{
+  ERRORMACRO( m_ic != NULL, Error, , "Video \"" << m_mrl << "\" is not open. "
+              "Did you call \"close\" before?" );
+  ERRORMACRO( av_seek_frame( m_ic, -1, timestamp, 0 ) >= 0,
+              Error, , "Error seeking in video \"" << m_mrl << "\"" );
+  avcodec_flush_buffers( m_enc );
+}
+
+long long AVInput::pts(void) throw (Error)
+{
+  ERRORMACRO( m_ic != NULL, Error, , "Video \"" << m_mrl << "\" is not open. "
+              "Did you call \"close\" before?" );
+  return m_pts;
+}
+
 VALUE AVInput::registerRubyClass( VALUE rbModule )
 {
   av_register_all();
   cRubyClass = rb_define_class_under( rbModule, "AVInput", rb_cObject );
   rb_define_singleton_method( cRubyClass, "new",
                               RUBY_METHOD_FUNC( wrapNew ), 1 );
+  rb_define_const( cRubyClass, "AV_TIME_BASE", INT2NUM( AV_TIME_BASE ) );
   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, "seek", RUBY_METHOD_FUNC( wrapSeek ), 1 );
+  rb_define_method( cRubyClass, "pts", RUBY_METHOD_FUNC( wrapPTS ), 0 );
 }
 
 void AVInput::deleteRubyObject( void *ptr )
@@ -157,3 +192,42 @@ VALUE AVInput::wrapRead( VALUE rbSelf )
   };
   return retVal;
 }
+
+VALUE AVInput::wrapTimeBase( VALUE rbSelf )
+{
+  VALUE retVal = Qnil;
+  try {
+    AVInputPtr *self; Data_Get_Struct( rbSelf, AVInputPtr, self );
+    AVRational time_base = (*self)->timeBase();
+    retVal = rb_funcall( rb_cObject, rb_intern( "Rational" ), 2,
+                         INT2NUM( time_base.num ), INT2NUM( time_base.den ) );
+  } catch( exception &e ) {
+    rb_raise( rb_eRuntimeError, "%s", e.what() );
+  };
+  return retVal;
+}
+
+VALUE AVInput::wrapSeek( VALUE rbSelf, VALUE rbPos )
+{
+  VALUE retVal = Qnil;
+  try {
+    AVInputPtr *self; Data_Get_Struct( rbSelf, AVInputPtr, self );
+    (*self)->seek( NUM2LL( rbPos ) );
+  } catch( exception &e ) {
+    rb_raise( rb_eRuntimeError, "%s", e.what() );
+  };
+  return retVal;
+}
+
+VALUE AVInput::wrapPTS( VALUE rbSelf )
+{
+  VALUE retVal = Qnil;
+  try {
+    AVInputPtr *self; Data_Get_Struct( rbSelf, AVInputPtr, self );
+    retVal = LL2NUM( (*self)->pts() );
+  } catch( exception &e ) {
+    rb_raise( rb_eRuntimeError, "%s", e.what() );
+  };
+  return retVal;
+}
+

data/ext/avinput.hh

@@ -32,17 +32,24 @@ public:
   virtual ~AVInput(void);
   void close(void);
   FramePtr read(void) throw (Error);
+  AVRational timeBase(void) throw (Error);
+  void seek( long timestamp ) throw (Error);
+  long long pts(void) throw (Error);
   static VALUE cRubyClass;
   static VALUE registerRubyClass( VALUE rbModule );
   static void deleteRubyObject( void *ptr );
   static VALUE wrapNew( VALUE rbClass, VALUE rbMRL );
   static VALUE wrapRead( VALUE rbSelf );
+  static VALUE wrapTimeBase( VALUE rbSelf );
+  static VALUE wrapSeek( VALUE rbSelf, VALUE rbPos );
+  static VALUE wrapPTS( VALUE rbSelf );
 protected:
   std::string m_mrl;
   AVFormatContext *m_ic;
   AVCodecContext *m_enc;
   AVCodec *m_codec;
   int m_idx;
+  long long m_pts;
   AVFrame *m_frame;
   boost::shared_array< char > m_data;
 };

data/ext/frame.cc

@@ -24,9 +24,13 @@ Frame::Frame( const char *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 memory = Data_Wrap_Struct( cMalloc, 0, 0, (void *)data );
+  VALUE rbSize = rb_funcall( cFrame, rb_intern( "typesize" ), 3,
+                             rb_const_get( mModule, rb_intern( typecode ) ),
+                             INT2NUM( width ), INT2NUM( height ) );
+  VALUE rbMemory = Data_Wrap_Struct( cMalloc, 0, 0, (void *)data );
+  rb_ivar_set( rbMemory, rb_intern( "@size" ), rbSize );
   m_frame = rb_funcall( cFrame, rb_intern( "import" ), 4,
                         rb_const_get( mModule, rb_intern( typecode ) ),
                         INT2NUM( width ), INT2NUM( height ),
-                        memory );
+                        rbMemory );
 }

data/lib/hornetseye-ffmpeg/avinput.rb

@@ -0,0 +1,57 @@
+# hornetseye-frame - Colourspace conversions and compression
+# Copyright (C) 2010 Jan Wedekind
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Namespace of Hornetseye computer vision library
+module Hornetseye
+
+  class AVInput
+
+    class << self
+
+      alias_method :orig_new, :new
+
+      def new( mrl )
+        retval = orig_new mrl
+        retval.instance_eval { @frame = nil }
+        retval
+      end
+
+    end
+
+    alias_method :orig_read, :read
+
+    def read
+      @frame = orig_read
+    end
+
+    def pos=( timestamp )
+      unless @frame
+        begin
+          read
+        rescue Exception
+        end
+      end
+      seek timestamp * AV_TIME_BASE
+    end
+
+    def pos
+      pts * time_base
+    end
+
+  end
+
+end
+

data/lib/hornetseye_ffmpeg_ext.rb

@@ -15,4 +15,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'hornetseye_frame'
+require 'hornetseye-ffmpeg/avinput'
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-26 00:00:00 +01:00
+date: 2010-09-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,6 +85,7 @@ files:
 - README.md
 - COPYING
 - .document
+- lib/hornetseye-ffmpeg/avinput.rb
 - lib/hornetseye_ffmpeg_ext.rb
 - ext/avinput.cc
 - ext/init.cc