streamio-ffmpeg 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 176d42fb71be4471958c695a6c6e1ab4d2f594a3
-  data.tar.gz: fc053ad1763a78b2e30bd89fe54c124459ba26d6
+  metadata.gz: d040320bc3f959563977e37be82de8c7dcc0b6dd
+  data.tar.gz: f3074b7953107d34c7560efc1be4ae5ab104341d
 SHA512:
-  metadata.gz: 16b6a964dd8bb2f9d32705fa76a15b405a33bb727b40724b57d0e9e5f4f14b029d617f9260380c269e11d2f0e8b5ac63ff1be7ae09ffbb6643f55af5579e5f25
-  data.tar.gz: 3f8bdb44849284e9d3c57b453e0c1498b4db3463ae6e14b83c885f6441d68bbee05f324210b3175dadc033f1d7f0a5671315996724a32644a640ad819195b0c3
+  metadata.gz: aedc131eef3f61197c5db195f8ed3f22dbd8dff133b47f8b3cdfc9c1c64640fee671cb087011e27a3d795e95d7764d431c6212ebcd763f0fa09c993a6de8bafe
+  data.tar.gz: 0ceaeb9d374541e9de8d1b70623632913ff69d60a39c8482fe7a28cc9a56be5bd983a7fa4414117045791355ebd7a2aa1a6bdf402a7b76b2571c0b068b31174c

data/CHANGELOG

@@ -1,6 +1,13 @@
 == Master
 
-Current with 3.0.0
+Current with 3.0.1
+
+== 3.0.1 2016-11-10
+
+Improvements:
+* Issue #144 is fixed. Of a nil movie is presented to transcode, the progress block does not fail
+* Issue #145 Adds ability to follow URLs when presented as Movie inputs
+
 
 == 3.0.0 2016-09-07
 

data/README.md

@@ -1,6 +1,8 @@
 Streamio FFMPEG
 ===============
 
+[![Code Climate](https://codeclimate.com/github/streamio/streamio-ffmpeg/badges/gpa.svg)](https://codeclimate.com/github/streamio/streamio-ffmpeg)
+
 Simple yet powerful wrapper around the ffmpeg command for reading metadata and transcoding movies.
 
 All work on this project is sponsored by the online video platform [Streamio](http://streamio.com).
@@ -10,7 +12,7 @@ All work on this project is sponsored by the online video platform [Streamio](ht
 Installation
 ------------
 
-    (sudo) gem install streamio-ffmpeg
+    gem install streamio-ffmpeg
 
 Compatibility
 -------------
@@ -27,13 +29,14 @@ The current gem is tested against ffmpeg 2.8.4. So no guarantees with earlier (o
 versions. Output and input standards have inconveniently changed rather a lot between versions 
 of ffmpeg. My goal is to keep this library in sync with new versions of ffmpeg as they come along.
 
+On macOS: `brew install ffmpeg`.
+
 Usage
 -----
 
 ### Require the gem
 
 ``` ruby
-require 'rubygems'
 require 'streamio-ffmpeg'
 ```
 
@@ -79,7 +82,7 @@ movie.transcode("movie.mp4") { |progress| puts progress } # 0.2 ... 0.5 ... 1.0
 Give custom command line options with an array.
 
 ``` ruby
-movie.transcode("movie.mp4", %w(-ac aac -vc libx264 -ac 2 ...)")
+movie.transcode("movie.mp4", %w(-ac aac -vc libx264 -ac 2 ...))
 ```
 
 Use the EncodingOptions parser for humanly readable transcoding options. Below you'll find most of the supported options.
@@ -87,12 +90,13 @@ Note that the :custom key is an array so that it can be used for FFMpeg options
 `-map` that can be repeated:
 
 ``` ruby
-options = {video_codec: "libx264", frame_rate: 10, resolution: "320x240", video_bitrate: 300, video_bitrate_tolerance: 100,
-           aspect: 1.333333, keyframe_interval: 90,
-           x264_vprofile: "high", x264_preset: "slow",
-           audio_codec: "libfaac", audio_bitrate: 32, audio_sample_rate: 22050, audio_channels: 1,
-           threads: 2,
-           custom: %w(-vf crop=60:60:10:10 -map 0:0 -map 0:1) }
+options = {
+  video_codec: "libx264", frame_rate: 10, resolution: "320x240", video_bitrate: 300, video_bitrate_tolerance: 100,
+  aspect: 1.333333, keyframe_interval: 90, x264_vprofile: "high", x264_preset: "slow",
+  audio_codec: "libfaac", audio_bitrate: 32, audio_sample_rate: 22050, audio_channels: 1,
+  threads: 2, custom: %w(-vf crop=60:60:10:10 -map 0:0 -map 0:1)
+}
+
 movie.transcode("movie.mp4", options)
 ```
 
@@ -169,7 +173,10 @@ Add watermark image on the video.
 For example, you want to add a watermark on the video at right top corner with 10px padding.
 
 ``` ruby
-options = { watermark: "full_path_of_watermark.png", resolution: "640x360", watermark_filter: { position: "RT", padding_x: 10, padding_y: 10 } }
+options = {
+  watermark: "full_path_of_watermark.png", resolution: "640x360",
+  watermark_filter: { position: "RT", padding_x: 10, padding_y: 10 }
+}
 ```
 
 Position can be "LT" (Left Top Corner), "RT" (Right Top Corner), "LB" (Left Bottom Corner), "RB" (Right Bottom Corner).
@@ -194,7 +201,7 @@ To generate multiple screenshots in a single pass, specify `vframes` and a wildc
 sure to disable output file validation. The following code generates up to 20 screenshots every 10 seconds:
 
 ``` ruby
-movie.screenshot("screenshot_%d.jpg", {vframes: 20, frame_rate: '1/6'}, validate: false)
+movie.screenshot("screenshot_%d.jpg", { vframes: 20, frame_rate: '1/6' }, validate: false)
 ```
 
 To specify the quality when generating compressed screenshots (.jpg), use `quality` which specifies
@@ -218,20 +225,27 @@ Since there is not movie to transcode, the Transcoder class needs to be used. Th
 provided through transcoder options.
 
 ``` ruby
-slideshow_transcoder = FFMPEG::Transcoder.new('', 'slideshow.mp4', {resolution: "320x240"}, input: 'img_%03d.jpeg', input_options: {framerate: '1/5' })
+slideshow_transcoder = FFMPEG::Transcoder.new(
+  '',
+  'slideshow.mp4',
+  { resolution: "320x240" },
+  input: 'img_%03d.jpeg',
+  input_options: { framerate: '1/5' }
+)
+
 slideshow = slideshow_transcoder.run
 ```
 
 Specify the path to ffmpeg
 --------------------------
 
-By default, the gem assumes that the ffmpeg binary is available in the execution path and named ffmpeg and so will run commands that look something like "ffmpeg -i /path/to/input.file ...". Use the FFMPEG.ffmpeg_binary setter to specify the full path to the binary if necessary:
+By default, the gem assumes that the ffmpeg binary is available in the execution path and named ffmpeg and so will run commands that look something like `ffmpeg -i /path/to/input.file ...`. Use the FFMPEG.ffmpeg_binary setter to specify the full path to the binary if necessary:
 
 ``` ruby
 FFMPEG.ffmpeg_binary = '/usr/local/bin/ffmpeg'
 ```
 
-This will cause the same command to run as "/usr/local/bin/ffmpeg -i /path/to/input.file ..." instead.
+This will cause the same command to run as `/usr/local/bin/ffmpeg -i /path/to/input.file ...` instead.
 
 
 Automatically kill hung processes
@@ -263,7 +277,6 @@ transcoder_options = { validate: false }
 movie.transcode("movie.mp4", options, transcoder_options) # returns nil
 ```
 
-
 Copyright
 ---------
 

data/lib/ffmpeg/errors.rb

@@ -1,4 +1,6 @@
 module FFMPEG
   class Error < StandardError
   end
+  class HTTPTooManyRequests < StandardError
+  end
 end

data/lib/ffmpeg/movie.rb

@@ -17,7 +17,7 @@ module FFMPEG
 
       if remote?
         @head = head
-        raise Errno::ENOENT, "the URL '#{path}' does not exist" if @head.nil? || @head.code.to_i != 200
+        raise Errno::ENOENT, "the URL '#{path}' does not exist" unless @head.is_a?(Net::HTTPSuccess)
       else
         raise Errno::ENOENT, "the file '#{path}' does not exist" unless File.exist?(path)
       end
@@ -25,7 +25,7 @@ module FFMPEG
       @path = path
 
       # ffmpeg will output to stderr
-      command = [FFMPEG.ffprobe_binary, '-i', path, *['-print_format', 'json', '-show_format', '-show_streams', '-show_error']]
+      command = [FFMPEG.ffprobe_binary, '-i', path, *%w(-print_format json -show_format -show_streams -show_error)]
       std_output = ''
       std_error = ''
 
@@ -132,7 +132,7 @@ module FFMPEG
     end
 
     def remote?
-      @path =~ URI::regexp
+      @path =~ URI::regexp(%w(http https))
     end
 
     def local?
@@ -217,14 +217,24 @@ module FFMPEG
       output.force_encoding("ISO-8859-1")
     end
 
-    def head
-      url = URI(@path)
+    def head(location=@path, limit=FFMPEG.max_http_redirect_attempts)
+      url = URI(location)
       return unless url.path
 
       http = Net::HTTP.new(url.host, url.port)
       http.use_ssl = url.port == 443
-      http.request_head(url.path)
-    rescue SocketError, Errno::ECONNREFUSED
+      response = http.request_head(url.request_uri)
+
+      case response
+        when Net::HTTPRedirection then
+          raise FFMPEG::HTTPTooManyRequests if limit == 0
+          new_uri = url + URI(response['Location'])
+
+          head(new_uri, limit - 1)
+        else
+          response
+      end
+    rescue SocketError, Errno::ECONNREFUSED => e
       nil
     end
   end

data/lib/ffmpeg/transcoder.rb

@@ -81,8 +81,11 @@ module FFMPEG
               else # better make sure it wont blow up in case of unexpected output
                 time = 0.0
               end
-              progress = time / @movie.duration
-              yield(progress) if block_given?
+
+              if @movie
+                progress = time / @movie.duration
+                yield(progress) if block_given?
+              end
             end
           end
 

data/lib/ffmpeg/version.rb

@@ -1,3 +1,3 @@
 module FFMPEG
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

data/lib/streamio-ffmpeg.rb

@@ -72,6 +72,24 @@ module FFMPEG
     @ffprobe_binary = bin
   end
 
+  # Get the maximum number of http redirect attempts
+  #
+  # @return [Integer] the maximum number of retries
+  def self.max_http_redirect_attempts
+    @max_http_redirect_attempts.nil? ? 10 : @max_http_redirect_attempts
+  end
+
+  # Set the maximum number of http redirect attempts.
+  #
+  # @param [Integer] the maximum number of retries
+  # @return [Integer] the number of retries you set
+  # @raise Errno::ENOENT if the value is negative or not an Integer
+  def self.max_http_redirect_attempts=(v)
+    raise Errno::ENOENT, 'max_http_redirect_attempts must be an integer' if v && !v.is_a?(Integer)
+    raise Errno::ENOENT, 'max_http_redirect_attempts may not be negative' if v && v < 0
+    @max_http_redirect_attempts = v
+  end
+
   # Cross-platform way of finding an executable in the $PATH.
   #
   #   which('ruby') #=> /usr/bin/ruby

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: streamio-ffmpeg
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Rackfish AB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json