Update to latest streamio-ffmpeg master.

.gitignore

@@ -13,6 +13,9 @@ tmtags
 ## VIM
 *.swp
 
+## RubyMine
+.idea/
+
 ## PROJECT::GENERAL
 coverage
 rdoc

.travis.yml

@@ -0,0 +1,13 @@
+before_install: wget http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz -O - | sudo tar -xJ --strip-components=1 -C /usr/local/bin/
+language: ruby
+rvm:
+  - 2.0.0
+  - 2.2
+  - 2.3.1
+cache:
+  - bundler
+addons:
+  code_climate:
+    repo_token: 25cb5ce0278a4633050937ff504ef0eef45f5756b53db51b179ad42ed5d8c428
+after_success:
+  - bundle exec codeclimate-test-reporter

CHANGELOG

@@ -1,10 +1,63 @@
 == Master
 
+Current with 3.0.2
+
+== 3.0.2 2016-11-18
+
+Improvements:
+* Issue #153 Adds support for multiple audio streams
+* Issue #150 Does not trust reported SAR/DAR as these may not be defined per https://trac.ffmpeg.org/ticket/3798
+
+== 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
+
+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
+
+New:
+* Issue #135, Support creating slideshows from stills
+* Issue #130, Adds support for a URL as an input
+* Support for specifying options to apply to the input file
+* Improved support for calling  FFMpeg with popen3, improving compatibility with various platforms, including windows
+* Issue #111. uses attr_accessor for the timeout attribute
+* Exposes the movie's entire meta data and format tags as movie attributes
+* Issue #122, adds encoding fix to stderr
+* All specs pass and brought current with Rspec V3
+* Issue #123, #131 improved stream validation, ignoring additional invalid streams if a valid stream is recognized
+* Issue #124, improved parsing for moving creation_time
+* SAR and DAR now adapt after rotation, DAR is ignored when calculating dimensions
+
+Improvements:
+* Allow parenthesis in colorspace (thanks walterdavis for initial code and rociiu for finding a bug with it)
+* Width and height now switched if video is filmed in portrait mode. ffmpeg 2.7 or later now automatically rotates output
+* Movie metadata now provided with ffprobe (#114). Thanks to Ryan Lovelett for the contributions!
+* Ability to create multiple screenshots at consistent intervals in one pass (#113)
+
+== 2.0.0 2016-01-14
+
 New:
 * Support watermarking (thanks smoothdvd)
+* Bumped target ffmpeg version to 2.8
 
 Improvements:
 * Allow parenthesis in colorspace (thanks walterdavis for initial code and rociiu for finding a bug with it)
+* Width and height now switched if video is filmed in portrait mode. ffmpeg 2.7 or later now automatically rotates output
+* Movie metadata now provided with ffprobe (#114). Thanks to Ryan Lovelett for the contributions!
+* Ability to create multiple screenshots at consistent intervals in one pass (#113)
 
 == 1.0.0 2013-07-08
 

Gemfile

@@ -1,3 +1,8 @@
 source "https://rubygems.org"
 
 gemspec
+
+group :test do
+  gem 'webmock'
+  gem 'simplecov'
+end

README.md

@@ -1,6 +1,10 @@
 Streamio FFMPEG
 ===============
 
+[![Build Status](https://travis-ci.org/bikeath1337/streamio-ffmpeg.svg?branch=master)](https://travis-ci.org/bikeath1337/streamio-ffmpeg)
+[![Code Climate](https://codeclimate.com/github/bikeath1337/streamio-ffmpeg/badges/gpa.svg)](https://codeclimate.com/github/bikeath1337/streamio-ffmpeg)
+[![Test Coverage](https://codeclimate.com/github/bikeath1337/streamio-ffmpeg/badges/coverage.svg)](https://codeclimate.com/github/bikeath1337/streamio-ffmpeg/coverage)
+
 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 +14,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
 -------------
@@ -23,15 +27,18 @@ Will not work in jruby until they fix: http://goo.gl/Z4UcX (should work in the u
 
 ### ffmpeg
 
-The current gem is tested against ffmpeg 1.2.1. So no guarantees with earlier (or much later) 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.
+The current gem is tested against ffmpeg 2.8.4. So no guarantees with earlier (or much later) 
+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'
 ```
 
@@ -57,6 +64,9 @@ movie.audio_codec # "aac"
 movie.audio_sample_rate # 44100
 movie.audio_channels # 2
 
+# Multiple audio streams
+movie.audio_streams[0] # "aac, 44100 Hz, stereo, s16, 75 kb/s" (raw audio stream info)
+
 movie.valid? # true (would be false if ffmpeg fails to read the movie)
 ```
 
@@ -74,21 +84,24 @@ 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,
-           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: "-vf crop=60:60:10:10"}
+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)
 ```
 
@@ -128,15 +141,52 @@ options = {video_min_bitrate: 600, video_max_bitrate: 600, buffer_size: 2000}
 movie.transcode("movie.flv", options)
 ```
 
+### Specifying Input Options
+
+To specify which options apply the input, such as changing the input framerate, use `input_options` hash
+in the transcoder_options.
+
+``` ruby
+movie = FFMPEG::Movie.new("path/to/movie.mov")
+
+transcoder_options = { input_options: { framerate: '1/5' } }
+movie.transcode("movie.mp4", {}, transcoder_options)
+
+# FFMPEG Command will look like this:
+# ffmpeg -y -framerate 1/5 -i path/to/movie.mov movie.mp4
+```
+
+### Overriding the Input Path
+
+If FFMPEG's input path needs to specify a sequence of files, rather than a path to a single movie, transcoding_options
+`input` can be set. If this option is present, the path of the original movie will not be used.
+
+``` ruby
+movie = FFMPEG::Movie.new("path/to/movie.mov")
+
+transcoder_options = { input: 'img_%03d.png' }
+movie.transcode("movie.mp4", {}, transcoder_options)
+
+# FFMPEG Command will look like this:
+# ffmpeg -y -i img_%03d.png movie.mp4
+```
+
+### Watermarking
+
 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).
+The watermark will not appear unless `watermark_options` specifies the position. `padding_x` and `padding_y` default to
+`10`.
 
 ### Taking Screenshots
 
@@ -152,28 +202,61 @@ The screenshot method has the very same API as transcode so the same options wil
 movie.screenshot("screenshot.bmp", seek_time: 5, resolution: '320x240')
 ```
 
+To generate multiple screenshots in a single pass, specify `vframes` and a wildcard filename. Make
+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)
+```
+
+To specify the quality when generating compressed screenshots (.jpg), use `quality` which specifies
+ffmpeg `-v:q` option. Quality is an integer between 1 and 31, where lower is better quality:
+
+``` ruby
+movie.screenshot("screenshot_%d.jpg", quality: 3)
+```
+
 You can preserve aspect ratio the same way as when using transcode.
 
 ``` ruby
 movie.screenshot("screenshot.png", { seek_time: 2, resolution: '200x120' }, preserve_aspect_ratio: :width)
 ```
 
+### Create a Slideshow from Stills
+Creating a slideshow from stills uses named sequences of files and stiches the result together in a slideshow
+video.
+
+Since there is not movie to transcode, the Transcoder class needs to be used. The input and input_options are
+provided through transcoder options.
+
+``` ruby
+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, streamio 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
 ---------------------------------
 
-By default, streamio will wait for 30 seconds between IO feedback from the FFMPEG process. After which an error is logged and the process killed.
+By default, the gem will wait for 30 seconds between IO feedback from the FFMPEG process. After which an error is logged and the process killed.
 It is possible to modify this behaviour by setting a new default:
 
 ``` ruby
@@ -199,7 +282,6 @@ transcoder_options = { validate: false }
 movie.transcode("movie.mp4", options, transcoder_options) # returns nil
 ```
 
-
 Copyright
 ---------