ffi-libav 0.2.0 → 0.3.0

data/lib/libav/frame.rb

@@ -89,10 +89,10 @@ class Libav::Frame::Video
                      :pixel_format => p[:pixel_format] || pixel_format,
                      :stream => stream)
     ctx = p[:scale_ctx] ||
-      sws_getContext(width, height, pixel_format,
-                     out.width, out.height, out.pixel_format,
-                     SWS_BICUBIC, nil, nil, nil)
-    raise NoMemoryError, "sws_getContext() failed" if ctx.nil?
+      sws_getCachedContext(nil, width, height, pixel_format,
+                           out.width, out.height, out.pixel_format,
+                           SWS_BICUBIC, nil, nil, nil)
+    raise NoMemoryError, "sws_getCachedContext() failed" if ctx.nil?
 
     # Scale the image
     rc = sws_scale(ctx, data, linesize, 0, height, out.data, out.linesize)

data/lib/libav/stream.rb

@@ -287,7 +287,10 @@ class Libav::Stream::Video
   end
 
   def fps
-    @av_stream[:r_frame_rate].to_f
+    fps = @av_stream[:r_frame_rate].to_f
+    # Some codecs don't set frame rate, so we'll use 1/timebase
+    fps = 1/@av_stream[:time_base].to_f if fps.nan?
+    fps
   end
 
   # Set the +width+ of the frames returned by +decode_frame+
@@ -447,12 +450,12 @@ class Libav::Stream::Video
       end
 
       # Let's throw together a scaling context
-      @swscale_ctx = sws_getContext(@av_codec_ctx[:width],
-                                    @av_codec_ctx[:height],
-                                    @av_codec_ctx[:pix_fmt],
-                                    @width, @height, @pixel_format,
-                                    SWS_BICUBIC, nil, nil, nil) or
-        raise NoMemoryError, "sws_getContext() failed"
+      @swscale_ctx = sws_getCachedContext(nil, @av_codec_ctx[:width],
+                                          @av_codec_ctx[:height],
+                                          @av_codec_ctx[:pix_fmt], @width,
+                                          @height, @pixel_format, SWS_BICUBIC,
+                                          nil, nil, nil) or
+        raise NoMemoryError, "sws_getCachedContext() failed"
     end
 
     @decode_ready = true

data/lib/libav/version.rb

@@ -1,3 +1,3 @@
 module Libav
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/frame_spec.rb

@@ -252,11 +252,11 @@ describe Libav::Frame, "#scale" do
       frame
     end
     subject do
-      ctx = FFI::Libav.sws_getContext(src_frame.width, src_frame.height,
-                                      src_frame.pixel_format,
-                                      100, 100, :gray8,
-                                      FFI::Libav::SWS_BICUBIC,
-                                      nil, nil, nil)
+      ctx = FFI::Libav.sws_getCachedContext(nil, src_frame.width,
+                                            src_frame.height,
+                                            src_frame.pixel_format, 100, 100,
+                                            :gray8, FFI::Libav::SWS_BICUBIC,
+                                            nil, nil, nil)
       src_frame.scale(:scale_ctx => ctx, :output_frame => dst_frame)
     end
     its(:class) { should be(Libav::Frame::Video) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-libav
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-31 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler