ffi-ffmpeg 0.7.0beae74ee3d7 → 0.8.525a2f4a3ce0

data/.hgignore

@@ -5,6 +5,7 @@ Gemfire.lock
 pkg/*
 
 *.png
+*.ppm
 .*.sw[a-z]
 .AppleDouble
 .DS_Store

data/README.md

@@ -4,7 +4,7 @@ http://github.com/dmlary/ffi-ffmpeg
 
 Description
 -----------
-Ruby-FFI bindings and wrappers for FFmpeg libraries.
+Ruby-FFI bindings and wrappers for FFmpeg libraries, version 0.5.1.
 
 Features
 --------
@@ -16,9 +16,51 @@ What's missing
 * Execute ffmpeg cleanup when Reader, Stream, Frame instances are gc'ed
 * Encoding
 
+OMG, FFmpeg 0.5.1 is so old
+---------------------------
+While working with ffmpeg in python, I got sick of constantly having to
+build and install a new version ffmpeg from source every time I upgraded 
+the ffmpeg wraper.  When I decided to write this ruby gem I selected the
+version that was available as a pre-built package for my servers which
+happen to run Ubuntu 10.04 LTS (lucid).  This version will not change
+until sometime after the next LTS release (mid-2012 ... that's a lot sooner
+that I expected).
+
+Getting 0.5.1 on OS X 10.6
+--------------------------
+You can either download, build and install ffmpeg from source, but it's
+much easier to use macports.  To get FFmpeg 0.5.1 via macports, you'll need
+to use an older revision of the port:
+
+    cd /tmp
+    svn co -r 66961 http://svn.macports.org/repository/macports/trunk/dports/multimedia/ffmpeg
+    cd ffmpeg
+    sudo port install
+
+This may fail while building some of the documentation for ffmpeg.  If it 
+does fail, you can edit the top-level Makefile in the work directory and 
+remove the html document targets:
+
+    --- Makefile	2011-11-20 21:42:28.000000000 -0600
+    +++ Makefile	2011-11-20 21:42:34.000000000 -0600
+    @@ -113,9 +113,7 @@
+     VHOOK_DEPS = $(HOOKS:$(SLIBSUF)=.d)
+     depend dep: $(VHOOK_DEPS)
+     
+    -documentation: $(addprefix doc/, ffmpeg-doc.html faq.html ffserver-doc.html \
+    -                                 ffplay-doc.html general.html hooks.html \
+    -                                 $(ALLMANPAGES))
+    +documentation: $(addprefix doc/, $(ALLMANPAGES))
+     
+     doc/%.html: doc/%.texi
+            texi2html -monolithic -number $<
+
+You may also need to set your DYLD_LIBRARY_PATH to point at /opt/local/lib
+for dlopen() to be able to find the macports compiled libraries.
+
 Usage
 -----
-    ruby
+
     require 'ffi-ffmpeg'
 
     # Allocate a reader for our video file

data/lib/ffi/ffmpeg.rb

@@ -1,12 +1,58 @@
 require 'ffi'
+require 'rbconfig'
+require 'dl'
 
 module FFI
   module FFmpeg
     extend FFI::Library
 
-    AV_NOPTS_VALUE = 0x8000000000000000
+    LIBRARY_FILENAME = {
+      :avutil   => ENV['FFI_FFMPEG_LIBAVUTIL'],
+      :avformat => ENV['FFI_FFMPEG_LIBAVFORMAT'],
+      :avcodec  => ENV['FFI_FFMPEG_LIBAVCODEC'],
+      :swscale  => ENV['FFI_FFMPEG_LIBSWSCALE']
+    }
+
+    case Config::CONFIG['target_os']
+    when /linux/
+      LIBRARY_FILENAME[:avutil]   ||= "libavutil.so.49"
+      LIBRARY_FILENAME[:avformat] ||= "libavformat.so.52"
+      LIBRARY_FILENAME[:avcodec]  ||= "libavcodec.so.52"
+      LIBRARY_FILENAME[:swscale]  ||= "libswscale.so.0"
+    when /darwin/
+      LIBRARY_FILENAME[:avutil]   ||= "libavutil.49"
+      LIBRARY_FILENAME[:avformat] ||= "libavformat.52"
+      LIBRARY_FILENAME[:avcodec]  ||= "libavcodec.52"
+
+      # Ok, this is stupid, but macports increments the major revision
+      # number from 0 to 1 to make some of their code work.  We check
+      # for this case here and try libswscale.0 failing back to 
+      # libswscale.1.
+      #
+      # See this commit for details:
+      #   https://svn.macports.org/changeset/43550
+      LIBRARY_FILENAME[:swscale]  ||= begin
+        DL.dlopen("libswscale.0.dylib").close
+        "libswscale.0"
+      rescue DL::DLError
+        "libswscale.1"
+      end
+    end
 
-    ffi_lib "libavutil.so.49"
+    ###################################################
+    #                                                 #
+    #  Definitions                                    #
+    #                                                 #
+    ###################################################
+    
+    AV_NOPTS_VALUE       = 0x8000000000000000
+    MAX_STREAMS          = 20
+    MAX_REORDER_DELAY    = 16
+    AVSEEK_FLAG_BACKWARD = 1
+    AVSEEK_FLAG_BYTE     = 2
+    AVSEEK_FLAG_ANY      = 4
+    AV_TIME_BASE         = 1000000
+    AV_PARSER_PTS_NB     = 4
 
     AVMediaType = enum :unknown, -1,
                        :video,
@@ -15,7 +61,7 @@ module FFI
                        :subtitle,
                        :attachment
 
-    BIG_ENDIAN = [1].pack("I") == [1].pack("N")
+    big_endian = [1].pack("I") == [1].pack("N")
     PixelFormat = enum :none, -1,
                        :yuv420p,
                        :yuyv422,
@@ -44,12 +90,12 @@ module FFI
                        :rgb4_byte,
                        :nv12,
                        :nv21,
-                       BIG_ENDIAN ? :rgb32 : :bgr32_1,    # :argb
-                       BIG_ENDIAN ? :rgb32_1 : :bgr32,    # :rgba
-                       BIG_ENDIAN ? :bgr32 : :rgb32_1,    # :abgr
-                       BIG_ENDIAN ? :bgr32_1 : :rgb32,    # :bgra
-                       BIG_ENDIAN ? :gray16 : :gray16_1,  # :gray16be
-                       BIG_ENDIAN ? :gray16_1 : :gray16,  # :gray16le
+                       big_endian ? :rgb32 : :bgr32_1,    # :argb
+                       big_endian ? :rgb32_1 : :bgr32,    # :rgba
+                       big_endian ? :bgr32 : :rgb32_1,    # :abgr
+                       big_endian ? :bgr32_1 : :rgb32,    # :bgra
+                       big_endian ? :gray16 : :gray16_1,  # :gray16be
+                       big_endian ? :gray16_1 : :gray16,  # :gray16le
                        :yuv440p,
                        :yuvj440p,
                        :yuva420p,
@@ -58,115 +104,51 @@ module FFI
                        :vdpau_mpeg2,
                        :vdpau_wmv3,
                        :vdpau_vc1,
-                       BIG_ENDIAN ? :rgb48 : :rgb48_1,    # :rgb48be
-                       BIG_ENDIAN ? :rgb48_1 : :rgb48,    # :rgb48le
-                       BIG_ENDIAN ? :rgb565 : :rgb565_1,  # :rgb565be
-                       BIG_ENDIAN ? :rgb565_1 : :rgb565,  # :rgb565le
-                       BIG_ENDIAN ? :rgb555 : :rgb555_1,  # :rgb555be
-                       BIG_ENDIAN ? :rgb555_1 : :rgb555,  # :rgb555le
-                       BIG_ENDIAN ? :bgr565 : :bgr565_1,  # :bgr565be
-                       BIG_ENDIAN ? :bgr565_1 : :bgr565,  # :bgr565le
-                       BIG_ENDIAN ? :bgr555 : :bgr555_1,  # :bgr555be
-                       BIG_ENDIAN ? :bgr555_1 : :bgr555,  # :bgr555le
+                       big_endian ? :rgb48 : :rgb48_1,    # :rgb48be
+                       big_endian ? :rgb48_1 : :rgb48,    # :rgb48le
+                       big_endian ? :rgb565 : :rgb565_1,  # :rgb565be
+                       big_endian ? :rgb565_1 : :rgb565,  # :rgb565le
+                       big_endian ? :rgb555 : :rgb555_1,  # :rgb555be
+                       big_endian ? :rgb555_1 : :rgb555,  # :rgb555le
+                       big_endian ? :bgr565 : :bgr565_1,  # :bgr565be
+                       big_endian ? :bgr565_1 : :bgr565,  # :bgr565le
+                       big_endian ? :bgr555 : :bgr555_1,  # :bgr555be
+                       big_endian ? :bgr555_1 : :bgr555,  # :bgr555le
                        :vaapi_moco,
                        :vaapi_idct,
                        :vaapi_vld,
-                       BIG_ENDIAN ? :yuv420p16_1 : :yuv420p16, # :yuv420p16le
-                       BIG_ENDIAN ? :yuv420p16 : :yuv420p16_1, # :yuv420p16be
-                       BIG_ENDIAN ? :yuv422p16_1 : :yuv422p16, # :yuv422p16le
-                       BIG_ENDIAN ? :yuv422p16 : :yuv422p16_1, # :yuv422p16be
-                       BIG_ENDIAN ? :yuv444p16_1 : :yuv444p16, # :yuv444p16le
-                       BIG_ENDIAN ? :yuv444p16 : :yuv444p16_1, # :yuv444p16be
+                       big_endian ? :yuv420p16_1 : :yuv420p16, # :yuv420p16le
+                       big_endian ? :yuv420p16 : :yuv420p16_1, # :yuv420p16be
+                       big_endian ? :yuv422p16_1 : :yuv422p16, # :yuv422p16le
+                       big_endian ? :yuv422p16 : :yuv422p16_1, # :yuv422p16be
+                       big_endian ? :yuv444p16_1 : :yuv444p16, # :yuv444p16le
+                       big_endian ? :yuv444p16 : :yuv444p16_1, # :yuv444p16be
                        :vdpau_mpeg4,
                        :dxva2_vld,
-                       BIG_ENDIAN ? :rgb444 : :rgb444_1,  # :rgb444be
-                       BIG_ENDIAN ? :rgb444_1 : :rgb444,  # :rgb444le
-                       BIG_ENDIAN ? :bgr444 : :bgr444_1,  # :bgr444be
-                       BIG_ENDIAN ? :bgr444_1 : :bgr444,  # :bgr444le
+                       big_endian ? :rgb444 : :rgb444_1,  # :rgb444be
+                       big_endian ? :rgb444_1 : :rgb444,  # :rgb444le
+                       big_endian ? :bgr444 : :bgr444_1,  # :bgr444be
+                       big_endian ? :bgr444_1 : :bgr444,  # :bgr444le
                        :y400a
 
     # Not actually an enum in libavutil.h, but we make it one here to
     # make the api prettier.
-    AVLogLevel = enum :quiet, -8,
-                      :panic, 0,
-                      :fatal, 8,
-                      :error, 16,
-                      :warning, 24,
-                      :info, 32,
-                      :verbose, 40,
-                      :debug, 48
-
-    attach_function :av_log_get_level, [], AVLogLevel
-    attach_function :av_log_set_level, [AVLogLevel], :void
-    attach_function :av_free, [:pointer], :void
-    attach_function :av_malloc, [:uint], :pointer
-
-    ffi_lib "libavformat.so.52"
-
-    MAX_STREAMS = 20
-    MAX_REORDER_DELAY = 16
-
-    AVSEEK_FLAG_BACKWARD = 1
-    AVSEEK_FLAG_BYTE     = 2
-    AVSEEK_FLAG_ANY      = 4
-    
-    attach_function :av_register_all, [], :void
-    attach_function :av_open_input_file,
-                      [:pointer, :string, :pointer, :int, :pointer],
-                      :int
-    attach_function :av_find_stream_info, [:pointer], :int
-    attach_function :dump_format,
-                      [:pointer, :int, :string, :int],
-                      :void
-    attach_function :av_read_frame, [:pointer, :pointer], :int
-    attach_function :av_seek_frame, [:pointer, :int, :long_long, :int], :int
-    attach_function :av_find_default_stream_index, [ :pointer ], :int
+    AVLogLevel   = enum :quiet,   -8,
+                        :panic,    0,
+                        :fatal,    8,
+                        :error,   16,
+                        :warning, 24,
+                        :info,    32,
+                        :verbose, 40,
+                        :debug,   48
+
+    AVDiscard    = enum :none,   -16,
+                        :default,  0,
+                        :nonref,   8,
+                        :bidir,   16,
+                        :nonkey,  32,
+                        :all,     48
 
-    # Defining this manually since it's a static inline:
-    #
-    # static inline void av_free_packet(AVPacket *pkt)
-    # {
-    #     if (pkt && pkt->destruct) {
-    #         pkt->destruct(pkt);
-    #     }
-    # }
-    #
-    def self.av_free_packet(pkt)
-      return unless pkt and pkt[:destruct]
-
-      FFI::Function.new(:void, [:pointer], pkt[:destruct], 
-                        :blocking => true).call(pkt)
-    end
-    
-    def av_free_packet(pkt)
-      FFI::FFmpeg.av_free_packet(pkt)
-    end
-
-    ffi_lib "libavcodec.so.52"
-    AV_TIME_BASE = 1000000
-    AV_PARSER_PTS_NB = 4
-
-    AVDiscard = enum :none, -16,
-                     :default, 0,
-                     :nonref, 8,
-                     :bidir, 16,
-                     :nonkey, 32,
-                     :all, 48
-
-    attach_function :avcodec_find_decoder, [:int], :pointer
-    attach_function :avcodec_open, [:pointer, :pointer], :int
-    attach_function :avcodec_alloc_frame, [], :pointer
-    attach_function :avpicture_get_size, [PixelFormat, :int, :int], :int
-    attach_function :avpicture_fill, 
-                    [:pointer, :pointer, PixelFormat, :int, :int],
-                    :int
-    attach_function :avcodec_decode_video, [:pointer, :pointer, :pointer,
-                                            :pointer, :int], :int,
-                                           { :blocking => true }
-    attach_function :avcodec_default_get_buffer, [:pointer, :pointer], :int
-    attach_function :avcodec_default_release_buffer, [:pointer, :pointer], :int
-
-    ffi_lib "libswscale.so.0"
     SWScaleFlags = enum :fast_bilinear, 0x001,
                         :bilinear,      0x002,
                         :bicubic,       0x004,
@@ -179,19 +161,13 @@ module FFI
                         :lanczos,       0x200,
                         :spline,        0x400
 
-    attach_function :sws_getContext, 
-                    [:int, :int, PixelFormat, :int, :int, PixelFormat,
-                     SWScaleFlags, :pointer, :pointer, :pointer],
-                    :pointer
-    attach_function :sws_freeContext,
-                    [:pointer],
-                    :void
-    attach_function :sws_scale,
-                    [:pointer, :pointer, :pointer, :int, 
-                     :int, :pointer, :pointer],
-                    :int,
-                    { :blocking => true }
+    callback :av_codec_context_get_buffer, [:pointer, :pointer], :int
 
+    ###################################################
+    #                                                 #
+    #  Data Structures                                #
+    #                                                 #
+    ###################################################
 
     class AVRational < FFI::Struct
       layout  :num, :int,
@@ -314,8 +290,6 @@ module FFI
       end
     end
 
-    callback :av_codec_context_get_buffer, [:pointer, :pointer], :int
-
     class AVCodecContext < FFI::Struct
       layout  :av_class, :pointer,
               :bit_rate, :int,
@@ -625,6 +599,83 @@ module FFI
               :reordered_opaque, :long_long
     end
 
+    ###################################################
+    #                                                 #
+    #  Functions                                      #
+    #                                                 #
+    ###################################################
+
+    ffi_lib LIBRARY_FILENAME[:avutil]
+
+    attach_function :av_log_get_level, [], AVLogLevel
+    attach_function :av_log_set_level, [AVLogLevel], :void
+    attach_function :av_free, [:pointer], :void
+    attach_function :av_malloc, [:uint], :pointer
+
+    ffi_lib LIBRARY_FILENAME[:avformat]
+    attach_function :av_register_all, [], :void
+    attach_function :av_open_input_file,
+                      [:pointer, :string, :pointer, :int, :pointer],
+                      :int
+    attach_function :av_find_stream_info, [:pointer], :int
+    attach_function :dump_format,
+                      [:pointer, :int, :string, :int],
+                      :void
+    attach_function :av_read_frame, [:pointer, :pointer], :int
+    attach_function :av_seek_frame, [:pointer, :int, :long_long, :int], :int
+    attach_function :av_find_default_stream_index, [ :pointer ], :int
+
+    # This function is inlined in avformat, defining it here
+    # for convenience.
+    #
+    # Original definition:
+    #     static inline void av_free_packet(AVPacket *pkt)
+    #     {
+    #         if (pkt && pkt->destruct) {
+    #             pkt->destruct(pkt);
+    #         }
+    #     }
+    #
+    def self.av_free_packet(pkt)
+      return unless pkt and pkt[:destruct]
+
+      FFI::Function.new(:void, [:pointer], pkt[:destruct], 
+                        :blocking => true).call(pkt)
+    end
+    
+    def av_free_packet(pkt)
+      FFI::FFmpeg.av_free_packet(pkt)
+    end
+
+    ffi_lib LIBRARY_FILENAME[:avcodec]
+    attach_function :avcodec_find_decoder, [:int], :pointer
+    attach_function :avcodec_open, [:pointer, :pointer], :int
+    attach_function :avcodec_alloc_frame, [], :pointer
+    attach_function :avpicture_get_size, [PixelFormat, :int, :int], :int
+    attach_function :avpicture_fill, 
+                    [:pointer, :pointer, PixelFormat, :int, :int],
+                    :int
+    attach_function :avcodec_decode_video, [:pointer, :pointer, :pointer,
+                                            :pointer, :int], :int,
+                                           { :blocking => true }
+    attach_function :avcodec_default_get_buffer, [:pointer, :pointer], :int
+    attach_function :avcodec_default_release_buffer, [:pointer, :pointer], :int
+
+    ffi_lib LIBRARY_FILENAME[:swscale]
+    attach_function :sws_getContext, 
+                    [:int, :int, PixelFormat, :int, :int, PixelFormat,
+                     SWScaleFlags, :pointer, :pointer, :pointer],
+                    :pointer
+    attach_function :sws_freeContext,
+                    [:pointer],
+                    :void
+    attach_function :sws_scale,
+                    [:pointer, :pointer, :pointer, :int, 
+                     :int, :pointer, :pointer],
+                    :int,
+                    { :blocking => true }
+
+    callback :av_codec_context_get_buffer, [:pointer, :pointer], :int
 
   end # module FFmpeg
 end # module FFI

data/lib/ffmpeg/reader.rb

@@ -27,7 +27,7 @@ class FFmpeg::Reader
 
   # Video duration in (fractional) seconds
   def duration
-    @av_format_ctx[:duration].to_f / AV_TIME_BASE
+    @duration ||= @av_format_ctx[:duration].to_f / AV_TIME_BASE
   end
 
   def each_frame(&block)

data/lib/ffmpeg/version.rb

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

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: ffi-ffmpeg
 version: !ruby/object:Gem::Version
-  version: 0.7.0beae74ee3d7
-  prerelease: 5
+  version: 0.8.525a2f4a3ce0
+  prerelease: 7
 platform: ruby
 authors:
 - David M. Lary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-06 00:00:00.000000000Z
+date: 2011-11-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &14840620 !ruby/object:Gem::Requirement
+  requirement: &17824180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14840620
+  version_requirements: *17824180
 description: Ruby FFI bindings for libavformat, libavcodec, libavutil, and libswscale
 email:
 - dmlary@gmail.com