ffi-ffmpeg 0.6.d2b7675f3785 → 0.7.0beae74ee3d7

data/ffi-ffmpeg.gemspec

@@ -10,11 +10,7 @@ Gem::Specification.new do |s|
   s.email       = ["dmlary@gmail.com"]
   s.homepage    = "http://bitbucket.org/dmlary/ffi-ffmpeg"
   s.summary     = %q{Ruby FFI bindings for FFmpeg libraries}
-  s.description = %q{Ruby FFI bindings for FFmpeg libraries:
-                      * libavformat
-                      * libavcodec
-                      * libavutil
-                      * libswscale}
+  s.description = %q{Ruby FFI bindings for libavformat, libavcodec, libavutil, and libswscale}
 
   s.rubyforge_project = "ffi-ffmpeg"
 

data/lib/ffi/ffmpeg.rb

@@ -143,6 +143,7 @@ module FFI
     end
 
     ffi_lib "libavcodec.so.52"
+    AV_TIME_BASE = 1000000
     AV_PARSER_PTS_NB = 4
 
     AVDiscard = enum :none, -16,

data/lib/ffmpeg/reader.rb

@@ -25,6 +25,11 @@ class FFmpeg::Reader
     FFI::FFmpeg.dump_format(@av_format_ctx, 0, @filename, 0)
   end
 
+  # Video duration in (fractional) seconds
+  def duration
+    @av_format_ctx[:duration].to_f / AV_TIME_BASE
+  end
+
   def each_frame(&block)
     raise ArgumentError, "No block provided" unless block_given?
 

data/lib/ffmpeg/stream.rb

@@ -127,11 +127,30 @@ class FFmpeg::Stream::Video
     # allocation to later be used as pts.
     @av_codec_ctx[:get_buffer] = @get_buffer_callback = \
         FFI::Function.new(:void, [:pointer, :pointer]) do |ctx, frame|
+
+      # alloc space for our pts value
+      # I really want to use FFI::MemoryPointer to alloc here, but
+      # due to a ffi bug (https://github.com/ffi/ffi/issues/174), I
+      # cannot recover the memory in the release buffer callback.
+      # For the time being we'll use av_malloc()/ac_free().
+      ptr = FFI::Pointer.new av_malloc(8)
+      raise MemoryError, "av_malloc() failed" if ptr.null?
+      ptr.write_uint64 @last_pts
+
+      # Grab our buffer
       ret = avcodec_default_get_buffer(ctx, frame)
-      AVFrame.new(frame)[:opaque] = FFI::Pointer.new(@last_pts)
-      # pp :alloc => @last_pts
+
+      # shove the pts into it
+      AVFrame.new(frame)[:opaque] = ptr
+
       ret
     end
+
+    @av_codec_ctx[:release_buffer] = @release_buffer_callback = \
+        FFI::Function.new(:void, [:pointer, :pointer]) do |ctx, frame|
+      av_free(AVFrame.new(frame)[:opaque])
+      avcodec_default_release_buffer(ctx, frame)
+    end
   end
     
   def fps
@@ -181,7 +200,8 @@ class FFmpeg::Stream::Video
     # the AVFrame.
     @raw_frame.pts = nil
     @raw_frame.pts = packet[:dts] unless packet[:dts] == AV_NOPTS_VALUE
-    @raw_frame.pts ||= @raw_frame.av_frame[:opaque].address
+    @raw_frame.pts ||= 
+      FFI::Pointer.new(@raw_frame.av_frame[:opaque]).read_uint64
 
     @raw_frame.number = @av_codec_ctx[:frame_number].to_i
     

data/lib/ffmpeg/version.rb

@@ -1,3 +1,3 @@
 module FFmpeg
-  VERSION = "0.6"
+  VERSION = "0.7"
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: ffi-ffmpeg
 version: !ruby/object:Gem::Version
-  version: 0.6.d2b7675f3785
-  prerelease: 4
+  version: 0.7.0beae74ee3d7
+  prerelease: 5
 platform: ruby
 authors:
 - David M. Lary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-01 00:00:00.000000000Z
+date: 2011-11-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &7888320 !ruby/object:Gem::Requirement
+  requirement: &14840620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,8 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7888320
-description: ! "Ruby FFI bindings for FFmpeg libraries:\n                      * libavformat\n
-  \                     * libavcodec\n                      * libavutil\n                      *
-  libswscale"
+  version_requirements: *14840620
+description: Ruby FFI bindings for libavformat, libavcodec, libavutil, and libswscale
 email:
 - dmlary@gmail.com
 executables: []
@@ -70,3 +68,4 @@ signing_key:
 specification_version: 3
 summary: Ruby FFI bindings for FFmpeg libraries
 test_files: []
+has_rdoc: