hornetseye-ffmpeg 0.9.1 → 0.10.0

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-ffmpeg'
-PKG_VERSION = '0.9.1'
+PKG_VERSION = '0.10.0'
 CFG = RbConfig::CONFIG
 CXX = ENV[ 'CXX' ] || 'g++'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -208,8 +208,8 @@ begin
     s.extra_rdoc_files = []
     s.rdoc_options = %w{--no-private}
     s.add_dependency %<malloc>, [ '~> 1.2' ]
-    s.add_dependency %<multiarray>, [ '~> 0.20' ]
-    s.add_dependency %<hornetseye-frame>, [ '~> 0.8' ]
+    s.add_dependency %<multiarray>, [ '~> 0.23' ]
+    s.add_dependency %<hornetseye-frame>, [ '~> 0.11' ]
     s.add_development_dependency %q{rake}
   end
   GEM_SOURCE = "#{PKG_NAME}-#{PKG_VERSION}.gem"
@@ -231,8 +231,8 @@ begin
     s.extra_rdoc_files = []
     s.rdoc_options = %w{--no-private}
     s.add_dependency %<malloc>, [ '~> 1.2' ]
-    s.add_dependency %<multiarray>, [ '~> 0.20' ]
-    s.add_dependency %<hornetseye-frame>, [ '~> 0.8' ]
+    s.add_dependency %<multiarray>, [ '~> 0.23' ]
+    s.add_dependency %<hornetseye-frame>, [ '~> 0.11' ]
   end
   GEM_BINARY = "#{PKG_NAME}-#{PKG_VERSION}-#{$BINSPEC.platform}.gem"
   desc "Build the gem file #{GEM_SOURCE}"

data/ext/init.cc

@@ -30,8 +30,8 @@ extern "C" {
 
   void Init_hornetseye_ffmpeg(void)
   {
-    rb_require( "rational" );
-    rb_require( "hornetseye_frame" );
+    rb_eval_string( "require 'rational'" );
+    rb_eval_string( "require 'hornetseye_frame'" );
     VALUE rbHornetseye = rb_define_module( "Hornetseye" );
     avcodec_register_all();
     av_register_all();

data/lib/hornetseye-ffmpeg/avinput.rb

@@ -58,12 +58,12 @@ module Hornetseye
     def enqueue_frame
       frame = read_av
       if frame.is_a? Frame_
-        @video.enq [ frame, video_pts ]
+        @video.enq [frame, video_pts]
         @frame = frame
       else
         n = channels
-        target = Hornetseye::MultiArray SINT, n, frame.size / ( 2 * n )
-        @audio.enq [ target.new( frame.memory ), audio_pts ]
+        samples = MultiArray.import(SINT, frame.memory, n, frame.size / (2 * n))
+        @audio.enq [samples, audio_pts]
       end
     end
 

data/lib/hornetseye-ffmpeg/avoutput.rb

@@ -39,7 +39,7 @@ module Hornetseye
                           audio_codec || CODEC_ID_NONE
         if have_audio
           retval.instance_eval do
-            @audio_buffer = Hornetseye::MultiArray( SINT, channels, frame_size ).new
+            @audio_buffer = MultiArray.new SINT, channels, frame_size
             @audio_samples = 0
           end
         end
@@ -70,18 +70,18 @@ module Hornetseye
         raise "Audio frame must have #{channels} channels " +
               "(but had #{frame.shape.first})"
       end
-      frame_type = Hornetseye::Sequence UBYTE, frame_size * 2 * channels
+      size = 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 )
+          orig_write_audio Sequence.import(UBYTE, @audio_buffer.memory, size)
           remaining = remaining[ 0 ... channels,
                                  frame_size - @audio_samples ... remaining.shape.last ]
           @audio_samples = 0
         else
-          orig_write_audio frame_type.new( remaining.memory )
+          orig_write_audio Sequence.import(UBYTE, remaining.memory, size)
           remaining = remaining[ 0 ... channels, frame_size ... remaining.shape.last ]
         end
       end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 9
-  - 1
-  version: 0.9.1
+  - 10
+  - 0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-12 00:00:00 +00:00
+date: 2011-06-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,8 +41,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 20
-        version: "0.20"
+        - 23
+        version: "0.23"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -55,8 +55,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 8
-        version: "0.8"
+        - 11
+        version: "0.11"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency