hornetseye-ffmpeg 0.5.4 → 0.6.0

data/Rakefile

@@ -7,15 +7,15 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-ffmpeg'
-PKG_VERSION = '0.5.4'
+PKG_VERSION = '0.6.0'
+CFG = RbConfig::CONFIG
 CXX = ENV[ 'CXX' ] || 'g++'
-STRIP = ENV[ 'STRIP' ] || 'strip'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
 CC_FILES = FileList[ 'ext/*.cc' ]
 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"
+SO_FILE = "ext/#{PKG_NAME.tr '\-', '_'}.#{CFG[ 'DLEXT' ]}"
 PKG_FILES = [ 'Rakefile', 'README.md', 'COPYING', '.document' ] +
             RB_FILES + CC_FILES + HH_FILES + TS_FILES + TC_FILES
 BIN_FILES = [ 'README.md', 'COPYING', '.document', SO_FILE ] +
@@ -27,17 +27,18 @@ EMAIL = %q{jan@wedesoft.de}
 HOMEPAGE = %q{http://wedesoft.github.com/hornetseye-ffmpeg/}
 
 OBJ = CC_FILES.ext 'o'
-$CXXFLAGS = ENV[ 'CXXFLAGS' ] || ''
-$CXXFLAGS = "#{$CXXFLAGS} -fPIC -DNDEBUG -DHAVE_CONFIG_H"
-if RbConfig::CONFIG[ 'rubyhdrdir' ]
-  $CXXFLAGS = "#{$CXXFLAGS} -I#{RbConfig::CONFIG[ 'rubyhdrdir' ]} " +
-             "-I#{RbConfig::CONFIG[ 'rubyhdrdir' ]}/#{RbConfig::CONFIG[ 'arch' ]}"
+$CXXFLAGS = "-DNDEBUG -DHAVE_CONFIG_H #{CFG[ 'CPPFLAGS' ]} #{CFG[ 'CFLAGS' ]}"
+if CFG[ 'rubyhdrdir' ]
+  $CXXFLAGS = "#{$CXXFLAGS} -I#{CFG[ 'rubyhdrdir' ]} " + 
+              "-I#{CFG[ 'rubyhdrdir' ]}/#{CFG[ 'arch' ]}"
 else
-  $CXXFLAGS = "#{$CXXFLAGS} -I#{RbConfig::CONFIG[ 'archdir' ]}"
+  $CXXFLAGS = "#{$CXXFLAGS} -I#{CFG[ 'archdir' ]}"
 end
-$LIBRUBYARG = RbConfig::CONFIG[ 'LIBRUBYARG' ]
-$SITELIBDIR = RbConfig::CONFIG[ 'sitelibdir' ]
-$SITEARCHDIR = RbConfig::CONFIG[ 'sitearchdir' ]
+$LIBRUBYARG = "-L#{CFG[ 'libdir' ]} #{CFG[ 'LIBRUBYARG' ]} #{CFG[ 'LDFLAGS' ]} " +
+              "#{CFG[ 'SOLIBS' ]} #{CFG[ 'DLDLIBS' ]}"
+$SITELIBDIR = CFG[ 'sitelibdir' ]
+$SITEARCHDIR = CFG[ 'sitearchdir' ]
+$LDSHARED = CFG[ 'LDSHARED' ][ CFG[ 'LDSHARED' ].index( ' ' ) .. -1 ]
 
 task :default => :all
 
@@ -46,7 +47,6 @@ task :all => [ SO_FILE ]
 
 file SO_FILE => OBJ do |t|
    sh "#{CXX} -shared -o #{t.name} #{OBJ} -lavformat -lswscale #{$LIBRUBYARG}"
-   sh "#{STRIP} --strip-all #{t.name}"
 end
 
 task :test => [ SO_FILE ]
@@ -209,7 +209,7 @@ begin
     s.rdoc_options = %w{--no-private}
     s.add_dependency %<malloc>, [ '~> 1.2' ]
     s.add_dependency %<multiarray>, [ '~> 0.11' ]
-    s.add_dependency %<hornetseye-frame>, [ '~> 0.7' ]
+    s.add_dependency %<hornetseye-frame>, [ '~> 0.8' ]
     s.add_development_dependency %q{rake}
   end
   GEM_SOURCE = "#{PKG_NAME}-#{PKG_VERSION}.gem"
@@ -232,7 +232,7 @@ begin
     s.rdoc_options = %w{--no-private}
     s.add_dependency %<malloc>, [ '~> 1.2' ]
     s.add_dependency %<multiarray>, [ '~> 0.11' ]
-    s.add_dependency %<hornetseye-frame>, [ '~> 0.7' ]
+    s.add_dependency %<hornetseye-frame>, [ '~> 0.8' ]
   end
   GEM_BINARY = "#{PKG_NAME}-#{PKG_VERSION}-#{$BINSPEC.platform}.gem"
   desc "Build the gem file #{GEM_SOURCE}"
@@ -264,7 +264,7 @@ rule '.o' => '.cc' do |t|
 end
 
 file ".depends.mf" => :config_h do |t|
-  sh "g++ -MM #{$CXXFLAGS} #{CC_FILES.join ' '} | " +
+  sh "g++ -MM #{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

data/ext/avinput.cc

@@ -29,7 +29,7 @@ using namespace std;
 
 VALUE AVInput::cRubyClass = Qnil;
 
-AVInput::AVInput( const string &mrl ) throw (Error):
+AVInput::AVInput( const string &mrl, bool audio ) throw (Error):
   m_mrl( mrl ), m_ic( NULL ), m_videoDec( NULL ), m_audioDec( NULL ),
   m_videoCodec( NULL ), m_audioCodec( NULL ),
   m_videoStream( -1 ), m_audioStream( -1 ), m_videoPts( 0 ), m_audioPts( 0 ),
@@ -42,11 +42,11 @@ AVInput::AVInput( const string &mrl ) throw (Error):
     err = av_find_stream_info( m_ic );
     ERRORMACRO( err >= 0, Error, , "Error finding stream info for file \""
                 << mrl << "\": " << strerror( errno ) );
-    for ( int i=0; i<m_ic->nb_streams; i++ ) {
+    for ( unsigned int i=0; i<m_ic->nb_streams; i++ ) {
       if ( m_ic->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO )
         m_videoStream = i;
-      if ( m_ic->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO )
-        m_audioStream = i;
+      if ( audio && m_ic->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO )
+          m_audioStream = i;
     };
 #ifndef NDEBUG
     cerr << "Video stream index is " << m_videoStream << endl;
@@ -150,14 +150,19 @@ void AVInput::readAV(void) throw (Error)
         AVFrame picture;
         m_videoFrame = FramePtr( new Frame( "YV12", m_videoDec->width,
                                             m_videoDec->height ) );
+        int
+          width   = m_videoDec->width,
+          height  = m_videoDec->height,
+          width2  = ( width  + 1 ) / 2,
+          height2 = ( height + 1 ) / 2,
+          widtha  = ( width  + 7 ) & ~0x7,
+          width2a = ( width2 + 7 ) & ~0x7;
         picture.data[0] = (uint8_t *)m_videoFrame->data();
-        picture.data[1] = (uint8_t *)m_videoFrame->data() +
-                          m_videoDec->width * m_videoDec->height * 5 / 4;
-        picture.data[2] = (uint8_t *)m_videoFrame->data() +
-                          m_videoDec->width * m_videoDec->height;
-        picture.linesize[0] = m_videoDec->width;
-        picture.linesize[1] = m_videoDec->width / 2;
-        picture.linesize[2] = m_videoDec->width / 2;
+        picture.data[2] = (uint8_t *)m_videoFrame->data() + widtha * height;
+        picture.data[1] = (uint8_t *)picture.data[2] + width2a * height2;
+        picture.linesize[0] = widtha;
+        picture.linesize[1] = width2a;
+        picture.linesize[2] = width2a;
         sws_scale( m_swsContext, m_avFrame->data, m_avFrame->linesize, 0,
                    m_videoDec->height, picture.data, picture.linesize );
         break;
@@ -223,6 +228,11 @@ int AVInput::height(void) const throw (Error)
   return m_videoDec->height;
 }
 
+bool AVInput::hasAudio(void) const
+{
+  return m_audioStream != -1;
+}
+
 AVRational AVInput::videoTimeBase(void) throw (Error)
 {
   ERRORMACRO( m_videoStream != -1, Error, , "Video \"" << m_mrl << "\" is not open. "
@@ -306,7 +316,7 @@ VALUE AVInput::registerRubyClass( VALUE rbModule )
 {
   cRubyClass = rb_define_class_under( rbModule, "AVInput", rb_cObject );
   rb_define_singleton_method( cRubyClass, "new",
-                              RUBY_METHOD_FUNC( wrapNew ), 1 );
+                              RUBY_METHOD_FUNC( wrapNew ), 2 );
   rb_define_const( cRubyClass, "AV_TIME_BASE", INT2NUM( AV_TIME_BASE ) );
   rb_define_const( cRubyClass, "AV_NOPTS_VALUE", LL2NUM( AV_NOPTS_VALUE ) );
   rb_define_method( cRubyClass, "close", RUBY_METHOD_FUNC( wrapClose ), 0 );
@@ -325,6 +335,7 @@ VALUE AVInput::registerRubyClass( VALUE rbModule )
   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, "has_audio?", RUBY_METHOD_FUNC( wrapHasAudio ), 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 );
@@ -335,12 +346,12 @@ void AVInput::deleteRubyObject( void *ptr )
   delete (AVInputPtr *)ptr;
 }
 
-VALUE AVInput::wrapNew( VALUE rbClass, VALUE rbMRL )
+VALUE AVInput::wrapNew( VALUE rbClass, VALUE rbMRL, VALUE rbAudio )
 {
   VALUE retVal = Qnil;
   try {
     rb_check_type( rbMRL, T_STRING );
-    AVInputPtr ptr( new AVInput( StringValuePtr( rbMRL ) ) );
+    AVInputPtr ptr( new AVInput( StringValuePtr( rbMRL ), rbAudio == Qtrue ) );
     retVal = Data_Wrap_Struct( rbClass, 0, deleteRubyObject,
                                new AVInputPtr( ptr ) );
   } catch ( exception &e ) {
@@ -393,7 +404,7 @@ VALUE AVInput::wrapVideoTimeBase( VALUE rbSelf )
     AVRational videoTimeBase = (*self)->videoTimeBase();
     retVal = rb_funcall( rb_cObject, rb_intern( "Rational" ), 2,
                          INT2NUM( videoTimeBase.num ), INT2NUM( videoTimeBase.den ) );
-  } catch( exception &e ) {
+  } catch ( exception &e ) {
     rb_raise( rb_eRuntimeError, "%s", e.what() );
   };
   return retVal;
@@ -407,7 +418,7 @@ VALUE AVInput::wrapAudioTimeBase( VALUE rbSelf )
     AVRational audioTimeBase = (*self)->audioTimeBase();
     retVal = rb_funcall( rb_cObject, rb_intern( "Rational" ), 2,
                          INT2NUM( audioTimeBase.num ), INT2NUM( audioTimeBase.den ) );
-  } catch( exception &e ) {
+  } catch ( exception &e ) {
     rb_raise( rb_eRuntimeError, "%s", e.what() );
   };
   return retVal;
@@ -421,7 +432,7 @@ VALUE AVInput::wrapFrameRate( VALUE rbSelf )
     AVRational frameRate = (*self)->frameRate();
     retVal = rb_funcall( rb_cObject, rb_intern( "Rational" ), 2,
                          INT2NUM( frameRate.num ), INT2NUM( frameRate.den ) );
-  } catch( exception &e ) {
+  } catch ( exception &e ) {
     rb_raise( rb_eRuntimeError, "%s", e.what() );
   };
   return retVal;
@@ -435,7 +446,7 @@ VALUE AVInput::wrapAspectRatio( VALUE rbSelf )
     AVRational aspectRatio = (*self)->aspectRatio();
     retVal = rb_funcall( rb_cObject, rb_intern( "Rational" ), 2,
                          INT2NUM( aspectRatio.num ), INT2NUM( aspectRatio.den ) );
-  } catch( exception &e ) {
+  } catch ( exception &e ) {
     rb_raise( rb_eRuntimeError, "%s", e.what() );
   };
   return retVal;
@@ -447,7 +458,7 @@ VALUE AVInput::wrapSampleRate( VALUE rbSelf )
   try {
     AVInputPtr *self; Data_Get_Struct( rbSelf, AVInputPtr, self );
     retVal = INT2NUM( (*self)->sampleRate() );
-  } catch( exception &e ) {
+  } catch ( exception &e ) {
     rb_raise( rb_eRuntimeError, "%s", e.what() );
   };
   return retVal;
@@ -459,7 +470,7 @@ VALUE AVInput::wrapChannels( VALUE rbSelf )
   try {
     AVInputPtr *self; Data_Get_Struct( rbSelf, AVInputPtr, self );
     retVal = INT2NUM( (*self)->channels() );
-  } catch( exception &e ) {
+  } catch ( exception &e ) {
     rb_raise( rb_eRuntimeError, "%s", e.what() );
   };
   return retVal;
@@ -471,7 +482,7 @@ VALUE AVInput::wrapDuration( VALUE rbSelf )
   try {
     AVInputPtr *self; Data_Get_Struct( rbSelf, AVInputPtr, self );
     retVal = LL2NUM( (*self)->duration() );
-  } catch( exception &e ) {
+  } catch ( exception &e ) {
     rb_raise( rb_eRuntimeError, "%s", e.what() );
   };
   return retVal;
@@ -483,7 +494,7 @@ VALUE AVInput::wrapStartTime( VALUE rbSelf )
   try {
     AVInputPtr *self; Data_Get_Struct( rbSelf, AVInputPtr, self );
     retVal = LL2NUM( (*self)->startTime() );
-  } catch( exception &e ) {
+  } catch ( exception &e ) {
     rb_raise( rb_eRuntimeError, "%s", e.what() );
   };
   return retVal;
@@ -495,7 +506,7 @@ VALUE AVInput::wrapWidth( VALUE rbSelf )
   try {
     AVInputPtr *self; Data_Get_Struct( rbSelf, AVInputPtr, self );
     retVal = INT2NUM( (*self)->width() );
-  } catch( exception &e ) {
+  } catch ( exception &e ) {
     rb_raise( rb_eRuntimeError, "%s", e.what() );
   };
   return retVal;
@@ -507,19 +518,25 @@ VALUE AVInput::wrapHeight( VALUE rbSelf )
   try {
     AVInputPtr *self; Data_Get_Struct( rbSelf, AVInputPtr, self );
     retVal = INT2NUM( (*self)->height() );
-  } catch( exception &e ) {
+  } catch ( exception &e ) {
     rb_raise( rb_eRuntimeError, "%s", e.what() );
   };
   return retVal;
 }
 
+VALUE AVInput::wrapHasAudio( VALUE rbSelf )
+{
+  AVInputPtr *self; Data_Get_Struct( rbSelf, AVInputPtr, self );
+  return (*self)->hasAudio() ? Qtrue : Qfalse;
+}
+
 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 ) {
+  } catch ( exception &e ) {
     rb_raise( rb_eRuntimeError, "%s", e.what() );
   };
   return retVal;
@@ -531,7 +548,7 @@ VALUE AVInput::wrapVideoPTS( VALUE rbSelf )
   try {
     AVInputPtr *self; Data_Get_Struct( rbSelf, AVInputPtr, self );
     retVal = LL2NUM( (*self)->videoPts() );
-  } catch( exception &e ) {
+  } catch ( exception &e ) {
     rb_raise( rb_eRuntimeError, "%s", e.what() );
   };
   return retVal;
@@ -543,7 +560,7 @@ VALUE AVInput::wrapAudioPTS( VALUE rbSelf )
   try {
     AVInputPtr *self; Data_Get_Struct( rbSelf, AVInputPtr, self );
     retVal = LL2NUM( (*self)->audioPts() );
-  } catch( exception &e ) {
+  } catch ( exception &e ) {
     rb_raise( rb_eRuntimeError, "%s", e.what() );
   };
   return retVal;

data/ext/avinput.hh

@@ -41,13 +41,14 @@ extern "C" {
 class AVInput
 {
 public:
-  AVInput( const std::string &mrl ) throw (Error);
+  AVInput( const std::string &mrl, bool audio = true ) throw (Error);
   virtual ~AVInput(void);
   void close(void);
   void readAV(void) throw (Error);
   bool status(void) const;
   int width(void) const throw (Error);
   int height(void) const throw (Error);
+  bool hasAudio(void) const;
   AVRational videoTimeBase(void) throw (Error);
   AVRational audioTimeBase(void) throw (Error);
   AVRational frameRate(void) throw (Error);
@@ -62,7 +63,7 @@ public:
   static VALUE cRubyClass;
   static VALUE registerRubyClass( VALUE rbModule );
   static void deleteRubyObject( void *ptr );
-  static VALUE wrapNew( VALUE rbClass, VALUE rbMRL );
+  static VALUE wrapNew( VALUE rbClass, VALUE rbMRL, VALUE rbAudio );
   static VALUE wrapClose( VALUE rbSelf );
   static VALUE wrapReadAV( VALUE rbSelf );
   VALUE wrapReadAVInst(void);
@@ -77,6 +78,7 @@ public:
   static VALUE wrapStartTime( VALUE rbSelf );
   static VALUE wrapWidth( VALUE rbSelf );
   static VALUE wrapHeight( VALUE rbSelf );
+  static VALUE wrapHasAudio( VALUE rbSelf );
   static VALUE wrapSeek( VALUE rbSelf, VALUE rbPos );
   static VALUE wrapVideoPTS( VALUE rbSelf );
   static VALUE wrapAudioPTS( VALUE rbSelf );

data/ext/avoutput.cc

@@ -14,22 +14,28 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #include <cerrno>
+#ifndef NDEBUG
+#include <iostream>
+#endif
 #include "avoutput.hh"
 
 #if !defined(INT64_C)
 #define INT64_C(c) c ## LL
 #endif
 
-#define VIDEO_BUF_SIZE 200000
+#define VIDEO_BUF_SIZE ( 16 * FF_MIN_BUFFER_SIZE )
+#define AUDIO_BUF_SIZE ( 2 * FF_MIN_BUFFER_SIZE )
 
 using namespace std;
 
 VALUE AVOutput::cRubyClass = Qnil;
 
-AVOutput::AVOutput( const string &mrl, int bitrate, int width, int height,
-                    int timeBaseNum, int timeBaseDen ) throw (Error):
-  m_mrl( mrl ), m_oc( NULL ), m_video_st( NULL ), m_video_codec_open( false ),
-  m_video_buf( NULL ), m_file_open( false ), m_header_written( false ),
+AVOutput::AVOutput( const string &mrl, int videoBitRate, int width, int height,
+                    int timeBaseNum, int timeBaseDen, int audioBitRate,
+                    int sampleRate, int channels ) throw (Error):
+  m_mrl( mrl ), m_oc( NULL ), m_video_st( NULL ), m_audio_st( NULL),
+  m_video_codec_open( false ), m_audio_codec_open( false ), m_video_buf( NULL ),
+  m_audio_buf( NULL ), m_file_open( false ), m_header_written( false ),
   m_swsContext( NULL ), m_frame( NULL )
 {
   try {
@@ -53,7 +59,7 @@ AVOutput::AVOutput( const string &mrl, int bitrate, int width, int height,
     AVCodecContext *c = m_video_st->codec;
     c->codec_id = format->video_codec;
     c->codec_type = CODEC_TYPE_VIDEO;
-    c->bit_rate = bitrate;
+    c->bit_rate = videoBitRate;
     c->width = width;
     c->height = height;
     c->time_base.num = timeBaseNum;
@@ -62,18 +68,46 @@ AVOutput::AVOutput( const string &mrl, int bitrate, int width, int height,
     c->pix_fmt = PIX_FMT_YUV420P;
     if ( m_oc->oformat->flags & AVFMT_GLOBALHEADER )
       c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+    if ( channels > 0 ) {
+      m_audio_st = av_new_stream( m_oc, 0 );
+      ERRORMACRO( m_audio_st != NULL, Error, , "Could not allocate audio stream" );
+      AVCodecContext *c = m_audio_st->codec;
+      c->codec_id = format->audio_codec;
+      c->codec_type = CODEC_TYPE_AUDIO;
+      c->bit_rate = audioBitRate;
+      c->sample_rate = sampleRate;
+      c->channels = channels;
+    };
     ERRORMACRO( av_set_parameters( m_oc, NULL ) >= 0, Error, ,
                 "Invalid output format parameters: " << strerror( errno ) );
     AVCodec *codec = avcodec_find_encoder( c->codec_id );
-    ERRORMACRO( codec != NULL, Error, , "Could not find codec " << c->codec_id );
+    ERRORMACRO( codec != NULL, Error, , "Could not find video codec "
+                << c->codec_id );
     ERRORMACRO( avcodec_open( c, codec ) >= 0, Error, ,
-                "Error opening codec " << c->codec_id << ": " << strerror( errno ) );
+                "Error opening video codec " << c->codec_id << ": "
+                << strerror( errno ) );
     m_video_codec_open = true;
     if ( !( m_oc->oformat->flags & AVFMT_RAWPICTURE ) ) {
       m_video_buf = (char *)av_malloc( VIDEO_BUF_SIZE );
       ERRORMACRO( m_video_buf != NULL, Error, ,
                   "Error allocating video output buffer" );
     };
+    if ( channels > 0 ) {
+      AVCodecContext *c = m_audio_st->codec;
+      AVCodec *codec = avcodec_find_encoder( c->codec_id );
+      ERRORMACRO( codec != NULL, Error, , "Could not find audio codec "
+                  << c->codec_id );
+      ERRORMACRO( avcodec_open( c, codec ) >= 0, Error, ,
+                  "Error opening audio codec " << c->codec_id << ": "
+                  << strerror( errno ) );
+      m_audio_codec_open = true;
+      m_audio_buf = (char *)av_malloc( AUDIO_BUF_SIZE );
+      ERRORMACRO( m_audio_buf != NULL, Error, ,
+                  "Error allocating audio output buffer" );
+#ifndef NDEBUG
+      cerr << "audio frame size = " << c->frame_size << " samples" << endl;
+#endif
+    };
     if ( !( format->flags & AVFMT_NOFILE ) ) {
       ERRORMACRO( url_fopen( &m_oc->pb, mrl.c_str(), URL_WRONLY ) >= 0, Error, ,
                   "Could not open \"" << mrl << "\"" );
@@ -120,21 +154,32 @@ void AVOutput::close(void)
     av_write_trailer( m_oc );
     m_header_written = false;
   };
+  if ( m_audio_st ) {
+    if ( m_audio_codec_open ) {
+      avcodec_close( m_audio_st->codec );
+      m_audio_codec_open = false;
+    };
+  };
   if ( m_video_st ) {
     if ( m_video_codec_open ) {
       avcodec_close( m_video_st->codec );
       m_video_codec_open = false;
     };
   };
+  if ( m_audio_buf ) {
+    av_free( m_audio_buf );
+    m_audio_buf = NULL;
+  };
   if ( m_video_buf ) {
     av_free( m_video_buf );
     m_video_buf = NULL;
   };
   if ( m_oc ) {
-    for ( int i = 0; i < m_oc->nb_streams; i++ ) {
+    for ( unsigned int i = 0; i < m_oc->nb_streams; i++ ) {
       av_freep( &m_oc->streams[i]->codec );
       av_freep( &m_oc->streams[i] );
     };
+    m_audio_st = NULL;
     m_video_st = NULL;
     if ( m_file_open ) {
 #ifdef HAVE_BYTEIO_PTR
@@ -149,7 +194,7 @@ void AVOutput::close(void)
   };
 }
 
-void AVOutput::write( FramePtr frame ) throw (Error)
+void AVOutput::writeVideo( FramePtr frame ) throw (Error)
 {
   ERRORMACRO( m_oc != NULL, Error, , "Video \"" << m_mrl << "\" is not open. "
               "Did you call \"close\" before?" );
@@ -173,7 +218,7 @@ void AVOutput::write( FramePtr frame ) throw (Error)
                c->height, m_frame->data, m_frame->linesize );
     int packetSize = avcodec_encode_video( c, (uint8_t *)m_video_buf,
                                            VIDEO_BUF_SIZE, m_frame );
-    ERRORMACRO( packetSize >= 0, Error, , "Error encoding frame" );
+    ERRORMACRO( packetSize >= 0, Error, , "Error encoding video frame" );
     if ( packetSize > 0 ) {
       AVPacket packet;
       av_init_packet( &packet );
@@ -186,19 +231,69 @@ void AVOutput::write( FramePtr frame ) throw (Error)
       packet.data = (uint8_t *)m_video_buf;
       packet.size = packetSize;
       ERRORMACRO( av_interleaved_write_frame( m_oc, &packet ) >= 0, Error, ,
-                  "Error writing frame of video \"" << m_mrl << "\": "
+                  "Error writing video frame of video \"" << m_mrl << "\": "
                   << strerror( errno ) );
     };
   };
 }
 
+int AVOutput::frameSize(void) throw (Error)
+{
+  ERRORMACRO( m_oc != NULL, Error, , "Video \"" << m_mrl << "\" is not open. "
+              "Did you call \"close\" before?" );
+  ERRORMACRO( m_audio_st != NULL, Error, , "Video \"" << m_mrl << "\" does not have "
+              "an audio stream" );
+  return m_audio_st->codec->frame_size;
+}
+
+int AVOutput::channels(void) throw (Error)
+{
+  ERRORMACRO( m_oc != NULL, Error, , "Video \"" << m_mrl << "\" is not open. "
+              "Did you call \"close\" before?" );
+  ERRORMACRO( m_audio_st != NULL, Error, , "Video \"" << m_mrl << "\" does not have "
+              "an audio stream" );
+  return m_audio_st->codec->channels;
+}
+
+void AVOutput::writeAudio( SequencePtr frame ) throw (Error)
+{
+  ERRORMACRO( m_oc != NULL, Error, , "Video \"" << m_mrl << "\" is not open. "
+              "Did you call \"close\" before?" );
+  ERRORMACRO( m_audio_st != NULL, Error, , "Video \"" << m_mrl << "\" does not have "
+              "an audio stream" );
+  AVCodecContext *c = m_audio_st->codec;
+  ERRORMACRO( frame->size() == c->frame_size * 2 * c->channels, Error, , "Size of "
+              "audio frame is " << frame->size() << " bytes (but should be "
+              << c->frame_size * 2 * c->channels << " bytes)" );
+  int packetSize = avcodec_encode_audio( c, (uint8_t *)m_audio_buf,
+                                         AUDIO_BUF_SIZE, (short *)frame->data() );
+  ERRORMACRO( packetSize >= 0, Error, , "Error encoding audio frame" );
+  if ( packetSize > 0 ) {
+    AVPacket packet;
+    av_init_packet( &packet );
+    if ( c->coded_frame && c->coded_frame->pts != AV_NOPTS_VALUE )
+      packet.pts = av_rescale_q( c->coded_frame->pts, c->time_base,
+                                 m_audio_st->time_base );
+    packet.flags |= PKT_FLAG_KEY;
+    packet.stream_index = m_audio_st->index;
+    packet.data = (uint8_t *)m_audio_buf;
+    packet.size = packetSize;
+    ERRORMACRO( av_interleaved_write_frame( m_oc, &packet ) >= 0, Error, ,
+                "Error writing audio frame of video \"" << m_mrl << "\": "
+                << strerror( errno ) );
+  };
+}
+
 VALUE AVOutput::registerRubyClass( VALUE rbModule )
 {
   cRubyClass = rb_define_class_under( rbModule, "AVOutput", rb_cObject );
   rb_define_singleton_method( cRubyClass, "new",
-                              RUBY_METHOD_FUNC( wrapNew ), 6 );
+                              RUBY_METHOD_FUNC( wrapNew ), 9 );
   rb_define_method( cRubyClass, "close", RUBY_METHOD_FUNC( wrapClose ), 0 );
-  rb_define_method( cRubyClass, "write", RUBY_METHOD_FUNC( wrapWrite ), 1 );
+  rb_define_method( cRubyClass, "frame_size", RUBY_METHOD_FUNC( wrapFrameSize ), 0 );
+  rb_define_method( cRubyClass, "channels", RUBY_METHOD_FUNC( wrapChannels ), 0 );
+  rb_define_method( cRubyClass, "write_video", RUBY_METHOD_FUNC( wrapWriteVideo ), 1 );
+  rb_define_method( cRubyClass, "write_audio", RUBY_METHOD_FUNC( wrapWriteAudio ), 1 );
 }
 
 void AVOutput::deleteRubyObject( void *ptr )
@@ -207,15 +302,17 @@ void AVOutput::deleteRubyObject( void *ptr )
 }
 
 VALUE AVOutput::wrapNew( VALUE rbClass, VALUE rbMRL, VALUE rbBitRate, VALUE rbWidth,
-                         VALUE rbHeight, VALUE rbTimeBaseNum, VALUE rbTimeBaseDen )
+                         VALUE rbHeight, VALUE rbTimeBaseNum, VALUE rbTimeBaseDen,
+                         VALUE rbAudioBitRate, VALUE rbSampleRate, VALUE rbChannels )
 {
   VALUE retVal = Qnil;
   try {
     rb_check_type( rbMRL, T_STRING );
     AVOutputPtr ptr( new AVOutput( StringValuePtr( rbMRL ), NUM2INT( rbBitRate ),
                                    NUM2INT( rbWidth ), NUM2INT( rbHeight ),
-                                   NUM2INT( rbTimeBaseNum ),
-                                   NUM2INT( rbTimeBaseDen ) ) );
+                                   NUM2INT( rbTimeBaseNum ), NUM2INT( rbTimeBaseDen ),
+                                   NUM2INT( rbAudioBitRate ), NUM2INT( rbSampleRate ),
+                                   NUM2INT( rbChannels ) ) );
     retVal = Data_Wrap_Struct( rbClass, 0, deleteRubyObject,
                                new AVOutputPtr( ptr ) );
   } catch ( exception &e ) {
@@ -231,14 +328,51 @@ VALUE AVOutput::wrapClose( VALUE rbSelf )
   return rbSelf;
 }
 
-VALUE AVOutput::wrapWrite( VALUE rbSelf, VALUE rbFrame )
+VALUE AVOutput::wrapFrameSize( VALUE rbSelf )
+{
+  VALUE rbRetVal = Qnil;
+  try {
+    AVOutputPtr *self; Data_Get_Struct( rbSelf, AVOutputPtr, self );
+    rbRetVal = INT2NUM( (*self)->frameSize() );
+  } catch ( exception &e ) {
+    rb_raise( rb_eRuntimeError, "%s", e.what() );
+  };
+  return rbRetVal;
+}
+
+VALUE AVOutput::wrapChannels( VALUE rbSelf )
+{
+  VALUE rbRetVal = Qnil;
+  try {
+    AVOutputPtr *self; Data_Get_Struct( rbSelf, AVOutputPtr, self );
+    rbRetVal = INT2NUM( (*self)->channels() );
+  } catch ( exception &e ) {
+    rb_raise( rb_eRuntimeError, "%s", e.what() );
+  };
+  return rbRetVal;
+}
+
+VALUE AVOutput::wrapWriteVideo( VALUE rbSelf, VALUE rbFrame )
 {
   try {
     AVOutputPtr *self; Data_Get_Struct( rbSelf, AVOutputPtr, self );
     FramePtr frame( new Frame( rbFrame ) );
-    (*self)->write( frame );
+    (*self)->writeVideo( frame );
   } catch ( exception &e ) {
     rb_raise( rb_eRuntimeError, "%s", e.what() );
   };
   return rbFrame;
 }
+
+VALUE AVOutput::wrapWriteAudio( VALUE rbSelf, VALUE rbFrame )
+{
+  try {
+    AVOutputPtr *self; Data_Get_Struct( rbSelf, AVOutputPtr, self );
+    SequencePtr frame( new Sequence( rbFrame ) );
+    (*self)->writeAudio( frame );
+  } catch ( exception &e ) {
+    rb_raise( rb_eRuntimeError, "%s", e.what() );
+  };
+  return rbFrame;
+}
+

data/ext/avoutput.hh

@@ -36,28 +36,40 @@ extern "C" {
 #include "rubyinc.hh"
 #include "error.hh"
 #include "frame.hh"
+#include "sequence.hh"
 
 class AVOutput
 {
 public:
-  AVOutput( const std::string &mrl, int bitrate, 
-            int width, int height, int timeBaseNum, int timeBaseDen ) throw (Error);
+  AVOutput( const std::string &mrl, int videoBitRate, 
+            int width, int height, int timeBaseNum, int timeBaseDen,
+            int audioBitRate, int sampleRate, int channels ) throw (Error);
   virtual ~AVOutput(void);
   void close(void);
-  void write( FramePtr frame ) throw (Error);
+  int frameSize(void) throw (Error);
+  int channels(void) throw (Error);
+  void writeVideo( FramePtr frame ) throw (Error);
+  void writeAudio( SequencePtr frame ) throw (Error);
   static VALUE cRubyClass;
   static VALUE registerRubyClass( VALUE rbModule );
   static void deleteRubyObject( void *ptr );
   static VALUE wrapNew( VALUE rbClass, VALUE rbMRL, VALUE rbBitRate, VALUE rbWidth,
-                        VALUE rbHeight, VALUE rbTimeBaseNum, VALUE rbTimeBaseDen );
+                        VALUE rbHeight, VALUE rbTimeBaseNum, VALUE rbTimeBaseDen,
+                        VALUE rbAudioBitRate, VALUE rbSampleRate, VALUE rbChannels );
   static VALUE wrapClose( VALUE rbSelf );
-  static VALUE wrapWrite( VALUE rbSelf, VALUE rbFrame );
+  static VALUE wrapFrameSize( VALUE rbSelf );
+  static VALUE wrapChannels( VALUE rbSelf );
+  static VALUE wrapWriteVideo( VALUE rbSelf, VALUE rbFrame );
+  static VALUE wrapWriteAudio( VALUE rbSelf, VALUE rbFrame );
 protected:
   std::string m_mrl;
   AVFormatContext *m_oc;
   AVStream *m_video_st;
+  AVStream *m_audio_st;
   bool m_video_codec_open;
+  bool m_audio_codec_open;
   char *m_video_buf;
+  char *m_audio_buf;
   bool m_file_open;
   bool m_header_written;
   struct SwsContext *m_swsContext;

data/lib/hornetseye-ffmpeg/avinput.rb

@@ -23,8 +23,8 @@ module Hornetseye
 
       alias_method :orig_new, :new
 
-      def new( mrl )
-        retval = orig_new mrl
+      def new( mrl, audio = true )
+        retval = orig_new mrl, audio
         retval.instance_eval do
           @frame = nil
           @video = Queue.new

data/lib/hornetseye-ffmpeg/avoutput.rb

@@ -23,16 +23,39 @@ module Hornetseye
 
       alias_method :orig_new, :new
 
-      def new( mrl, bitrate, width, height, frame_rate )
+      def new( mrl, video_bit_rate, width, height, frame_rate, have_audio = false,
+               audio_bit_rate = 64000, sample_rate = 44100, channels = 2 )
         if frame_rate.is_a? Float
           frame_rate = Rational( 90000, ( 90000 / frame_rate ).to_i )
         end
-        orig_new mrl, bitrate, width, height,
-                 frame_rate.denominator, frame_rate.numerator
+        orig_new mrl, video_bit_rate, width, height,
+                 frame_rate.denominator, frame_rate.numerator,
+                 have_audio ? audio_bit_rate : 0,
+                 have_audio ? sample_rate : 0,
+                 have_audio ? channels : 0
       end
 
     end
 
+    alias_method :write, :write_video
+
+    alias_method :orig_write_video, :write_video
+
+    def write_video( frame )
+      orig_write_video frame.to_yv12
+    end
+
+    alias_method :orig_write_audio, :write_audio
+
+    def write_audio( frame )
+      if frame.shape != [ channels, frame_size ]
+        raise "Audio frame must have #{channels} channels and #{frame_size} " +
+              "samples (but had #{frame.shape[0]} channels and #{frame.shape[1]} " +
+              "samples)"
+      end
+      orig_write_audio Sequence( UBYTE, frame.storage_size ).new( frame.memory )
+    end
+
   end
 
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 4
-  version: 0.5.4
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 +01:00
+date: 2010-11-13 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,8 +55,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 7
-        version: "0.7"
+        - 8
+        version: "0.8"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency