hornetseye-ffmpeg 0.7.0 → 0.8.0

data/Rakefile

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

data/ext/avoutput.cc

@@ -31,7 +31,8 @@ using namespace std;
 VALUE AVOutput::cRubyClass = Qnil;
 
 AVOutput::AVOutput( const string &mrl, int videoBitRate, int width, int height,
-                    int timeBaseNum, int timeBaseDen, enum CodecID videoCodec,
+                    int timeBaseNum, int timeBaseDen, int aspectRatioNum,
+                    int aspectRatioDen, enum CodecID videoCodec,
                     int audioBitRate, int sampleRate, int channels,
                     enum CodecID audioCodec ) throw (Error):
   m_mrl( mrl ), m_oc( NULL ), m_video_st( NULL ), m_audio_st( NULL),
@@ -57,6 +58,8 @@ AVOutput::AVOutput( const string &mrl, int videoBitRate, int width, int height,
                 "Output format does not support video" );
     m_video_st = av_new_stream( m_oc, 0 );
     ERRORMACRO( m_video_st != NULL, Error, , "Could not allocate video stream" );
+    m_video_st->sample_aspect_ratio.num = aspectRatioNum;
+    m_video_st->sample_aspect_ratio.den = aspectRatioDen;
     AVCodecContext *c = m_video_st->codec;
     c->codec_id = videoCodec != CODEC_ID_NONE ? videoCodec : format->video_codec;
     c->codec_type = CODEC_TYPE_VIDEO;
@@ -67,6 +70,8 @@ AVOutput::AVOutput( const string &mrl, int videoBitRate, int width, int height,
     c->time_base.den = timeBaseDen;
     c->gop_size = 12;
     c->pix_fmt = PIX_FMT_YUV420P;
+    c->sample_aspect_ratio.num = aspectRatioNum;
+    c->sample_aspect_ratio.den = aspectRatioDen;
     if ( m_oc->oformat->flags & AVFMT_GLOBALHEADER )
       c->flags |= CODEC_FLAG_GLOBAL_HEADER;
     if ( channels > 0 ) {
@@ -78,6 +83,8 @@ AVOutput::AVOutput( const string &mrl, int videoBitRate, int width, int height,
       c->bit_rate = audioBitRate;
       c->sample_rate = sampleRate;
       c->channels = channels;
+      if ( m_oc->oformat->flags & AVFMT_GLOBALHEADER )
+        c->flags |= CODEC_FLAG_GLOBAL_HEADER;
     };
     ERRORMACRO( av_set_parameters( m_oc, NULL ) >= 0, Error, ,
                 "Invalid output format parameters: " << strerror( errno ) );
@@ -296,7 +303,7 @@ VALUE AVOutput::registerRubyClass( VALUE rbModule )
 {
   cRubyClass = rb_define_class_under( rbModule, "AVOutput", rb_cObject );
   rb_define_singleton_method( cRubyClass, "new",
-                              RUBY_METHOD_FUNC( wrapNew ), 11 );
+                              RUBY_METHOD_FUNC( wrapNew ), 13 );
   rb_define_const( cRubyClass, "CODEC_ID_NONE",
                    INT2FIX( CODEC_ID_NONE ) );
   rb_define_const( cRubyClass, "CODEC_ID_MPEG1VIDEO",
@@ -781,6 +788,7 @@ void AVOutput::deleteRubyObject( void *ptr )
 
 VALUE AVOutput::wrapNew( VALUE rbClass, VALUE rbMRL, VALUE rbBitRate, VALUE rbWidth,
                          VALUE rbHeight, VALUE rbTimeBaseNum, VALUE rbTimeBaseDen,
+                         VALUE rbAspectRatioNum, VALUE rbAspectRatioDen,
                          VALUE rbVideoCodec, VALUE rbAudioBitRate, VALUE rbSampleRate,
                          VALUE rbChannels, VALUE rbAudioCodec )
 {
@@ -790,6 +798,8 @@ VALUE AVOutput::wrapNew( VALUE rbClass, VALUE rbMRL, VALUE rbBitRate, VALUE rbWi
     AVOutputPtr ptr( new AVOutput( StringValuePtr( rbMRL ), NUM2INT( rbBitRate ),
                                    NUM2INT( rbWidth ), NUM2INT( rbHeight ),
                                    NUM2INT( rbTimeBaseNum ), NUM2INT( rbTimeBaseDen ),
+                                   NUM2INT( rbAspectRatioNum ),
+                                   NUM2INT( rbAspectRatioDen ),
                                    (enum CodecID)NUM2INT( rbVideoCodec ),
                                    NUM2INT( rbAudioBitRate ), NUM2INT( rbSampleRate ),
                                    NUM2INT( rbChannels ),

data/ext/avoutput.hh

@@ -42,7 +42,8 @@ class AVOutput
 {
 public:
   AVOutput( const std::string &mrl, int videoBitRate, int width, int height,
-            int timeBaseNum, int timeBaseDen, enum CodecID videoCodec,
+            int timeBaseNum, int timeBaseDen, int aspectRatioNum,
+            int aspectRatioDen, enum CodecID videoCodec,
             int audioBitRate, int sampleRate, int channels,
             enum CodecID audioCodec ) throw (Error);
   virtual ~AVOutput(void);
@@ -56,6 +57,7 @@ public:
   static void deleteRubyObject( void *ptr );
   static VALUE wrapNew( VALUE rbClass, VALUE rbMRL, VALUE rbBitRate, VALUE rbWidth,
                         VALUE rbHeight, VALUE rbTimeBaseNum, VALUE rbTimeBaseDen,
+                        VALUE rbAspectRatioNum, VALUE rbAspectRatioDen,
                         VALUE rbVideoCodec, VALUE rbAudioBitRate, VALUE rbSampleRate,
                         VALUE rbChannels, VALUE rbAudioCodec );
   static VALUE wrapClose( VALUE rbSelf );

data/lib/hornetseye-ffmpeg/avoutput.rb

@@ -23,19 +23,27 @@ module Hornetseye
 
       alias_method :orig_new, :new
 
-      def new( mrl, video_bit_rate, width, height, frame_rate, video_codec = nil,
-               have_audio = false, audio_bit_rate = 64000, sample_rate = 44100,
-               channels = 2, audio_codec = nil )
+      def new( mrl, video_bit_rate, width, height, frame_rate, aspect_ratio = 1,
+               video_codec = nil, have_audio = false, audio_bit_rate = 64000,
+               sample_rate = 44100, channels = 2, audio_codec = nil )
         if frame_rate.is_a? Float
           frame_rate = Rational( 90000, ( 90000 / frame_rate ).to_i )
         end
-        orig_new mrl, video_bit_rate, width, height,
-                 frame_rate.denominator, frame_rate.numerator,
-                 video_codec || CODEC_ID_NONE,
-                 have_audio ? audio_bit_rate : 0,
-                 have_audio ? sample_rate : 0,
-                 have_audio ? channels : 0,
-                 audio_codec || CODEC_ID_NONE
+        retval = orig_new mrl, video_bit_rate, width, height,
+                          frame_rate.denominator, frame_rate.numerator,
+                          aspect_ratio.numerator, aspect_ratio.denominator,
+                          video_codec || CODEC_ID_NONE,
+                          have_audio ? audio_bit_rate : 0,
+                          have_audio ? sample_rate : 0,
+                          have_audio ? channels : 0,
+                          audio_codec || CODEC_ID_NONE
+        if have_audio
+          retval.instance_eval do
+            @audio_buffer = Hornetseye::MultiArray( SINT, channels, frame_size ).new
+            @audio_samples = 0
+          end
+        end
+        retval
       end
 
     end
@@ -51,12 +59,37 @@ module Hornetseye
     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)"
+      unless frame.typecode == SINT
+        raise "Audio frame must have elements of type SINT (but elements were of " +
+              "type #{frame.typecode})"
+      end
+      unless frame.dimension == 2
+        raise "Audio frame must have 2 dimensions (but had #{frame.dimensions})"
+      end
+      unless frame.shape.first == channels
+        raise "Audio frame must have #{channels} channels " +
+              "(but had #{frame.shape.first})"
+      end
+      frame_type = Hornetseye::Sequence UBYTE, frame_size * 2 * channels
+      remaining = frame
+      while @audio_samples + remaining.shape.last >= frame_size
+        if @audio_samples > 0
+          @audio_buffer[ @audio_samples ... frame_size ] =
+            remaining[ 0 ... frame_size - @audio_samples ]
+          orig_write_audio frame_type.new( @audio_buffer.memory )
+          remaining = remaining[ 0 ... channels,
+                                 frame_size - @audio_samples ... remaining.shape.last ]
+          @audio_samples = 0
+        else
+          orig_write_audio frame_type.new( remaining.memory )
+          remaining = remaining[ 0 ... channels, frame_size ... remaining.shape.last ]
+        end
+      end
+      if remaining.shape.last > 0
+        @audio_buffer[ 0 ... channels, 0 ... remaining.shape.last ] = remaining
+        @audio_samples = remaining.shape.last
       end
-      orig_write_audio Sequence( UBYTE, frame.storage_size ).new( frame.memory )
+      frame
     end
 
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-13 00:00:00 +00:00
+date: 2010-11-14 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency