streamio-ffmpeg 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a9cde12ae96942f93cff233ac586afa9dcb804d
-  data.tar.gz: 9fc3c59bbd8ebdcf0aa00dac17a0314c8490e877
+  metadata.gz: 176d42fb71be4471958c695a6c6e1ab4d2f594a3
+  data.tar.gz: fc053ad1763a78b2e30bd89fe54c124459ba26d6
 SHA512:
-  metadata.gz: 02226d4978a610a81cf08c154a99aeb18782a85e0e1071d836e9da1c57e0920780758f210490e7003ece9e551c2f2fc0247648be8ce8f0a4abebeb3a6ce61969
-  data.tar.gz: c31ab9b785ea8f1b58e009c2770c91caf9a4071bab81cadac187bb74dfa34e049f30269b7514800e7c1578169537949ce33551523f7226c34e8d4122fdd364e5
+  metadata.gz: 16b6a964dd8bb2f9d32705fa76a15b405a33bb727b40724b57d0e9e5f4f14b029d617f9260380c269e11d2f0e8b5ac63ff1be7ae09ffbb6643f55af5579e5f25
+  data.tar.gz: 3f8bdb44849284e9d3c57b453e0c1498b4db3463ae6e14b83c885f6441d68bbee05f324210b3175dadc033f1d7f0a5671315996724a32644a640ad819195b0c3

data/CHANGELOG

@@ -1,6 +1,17 @@
 == Master
 
-Current with 2.0.0
+Current with 3.0.0
+
+== 3.0.0 2016-09-07
+
+Breaking Changes:
+* Changes: custom parameters now specified using an array syntax
+
+Improvements:
+* Issue # 128, #137 are fixed (custom parameters passed as strings) which was caused
+  by 2.1.0 in attempting to avoid the use of shell and filename escaping issues
+  on various platforms.
+
 
 == 2.1.0 2016-08-08
 

data/README.md

@@ -76,13 +76,15 @@ Keep track of progress with an optional block.
 movie.transcode("movie.mp4") { |progress| puts progress } # 0.2 ... 0.5 ... 1.0
 ```
 
-Give custom command line options with a string.
+Give custom command line options with an array.
 
 ``` ruby
-movie.transcode("movie.mp4", "-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. Note that the :custom key will be used as is without modification so use it for any tricky business you might need.
+Use the EncodingOptions parser for humanly readable transcoding options. Below you'll find most of the supported options.
+Note that the :custom key is an array so that it can be used for FFMpeg options like
+`-map` that can be repeated:
 
 ``` ruby
 options = {video_codec: "libx264", frame_rate: 10, resolution: "320x240", video_bitrate: 300, video_bitrate_tolerance: 100,
@@ -90,7 +92,7 @@ options = {video_codec: "libx264", frame_rate: 10, resolution: "320x240", video_
            x264_vprofile: "high", x264_preset: "slow",
            audio_codec: "libfaac", audio_bitrate: 32, audio_sample_rate: 22050, audio_channels: 1,
            threads: 2,
-           custom: "-vf crop=60:60:10:10"}
+           custom: %w(-vf crop=60:60:10:10 -map 0:0 -map 0:1) }
 movie.transcode("movie.mp4", options)
 ```
 

data/lib/ffmpeg/encoding_options.rb

@@ -189,6 +189,7 @@ module FFMPEG
     end
 
     def convert_custom(value)
+      raise ArgumentError unless value.class <= Array
       value
     end
 

data/lib/ffmpeg/transcoder.rb

@@ -22,7 +22,7 @@ module FFMPEG
       elsif options.is_a?(Hash)
         @raw_options = EncodingOptions.new(options)
       else
-        raise ArgumentError, "Unknown options format '#{options.class}', should be either EncodingOptions, Hash or String."
+        raise ArgumentError, "Unknown options format '#{options.class}', should be either EncodingOptions, Hash or Array."
       end
 
       @transcoder_options = transcoder_options

data/lib/ffmpeg/version.rb

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

metadata

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