media 0.0.4 → 0.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2fb70c328dee96f418950ed12a3d85b60ee75aee
+  data.tar.gz: 83bea2146bbcea48d42fbfb354d48ebc56a9ae89
+SHA512:
+  metadata.gz: c7a73aff5350a8ca3bdb8fc0191f98c45115bbce8b850d48f78655b4afc3ae767afb67013a5354da6240034a8936fe61997eeb8202efbc9e96f283daba8f9ece
+  data.tar.gz: dad2c218fb341c24cc3a9bd778c06fb6500ce558f666e93dfb21dd56ec17a37d454d7941ba485c338396fb76fa84faa9e3bdf99ecda2fd89ba309ece6df5feab

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Jamie Hodge
+Copyright (c) 2013 Copenhagen University
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -6,7 +6,7 @@ An `ffmpeg` or `avconv` wrapper
 
 Install ffmpeg:
 
-    brew install ffmpeg
+    brew install ffmpeg --with-tools --with-libvpx --with-libvorbis --with-libtheora
 
 Add this line to your application's Gemfile:
 
@@ -22,26 +22,29 @@ Or install it yourself as:
 
 ## Usage
 
+Convert:
+
     conversion = Media.convert do
       options y: true
   
+      # this example is slow, due to heavy network usage
       input 'http://www.google.com/images/srpr/logo3w.png' do
         options loop: 1, f: 'image2'
       end
   
-      output '/path/to/test2.webm' do
+      output '/path/to/example.webm' do
         options vcodec: 'libvpx', acodec: 'libvorbis', t: 4
         maps label('video'), label('audio')
         graph do
           chain do
             filter 'negate'
-            filter 'hflip' do
-              outputs 'video'
+            filter 'hflip' do |f| # optional
+              f.outputs 'video'
             end
           end
           chain do
             filter 'aevalsrc' do
-              arguments 'sin(440*2*PI*t)' => true
+              expressions 'sin(440*2*PI*t)'
               outputs 'audio'
             end
           end
@@ -50,10 +53,18 @@ Or install it yourself as:
     end
 
     conversion.call {|progress| p progress}
+    
+Probe:
 
-Outputs:    
-
-    ffmpeg -v info -y -loop 1 -f image2 -i http://www.google.com/images/srpr/logo3w.png -vcodec libvpx -acodec libvorbis -t 4 -map [video] -map [audio] -filter_complex negate, hflip [video]; aevalsrc=sin(440*2*PI*t) [audio] /path/to/test2.webm
+    probe = Media.probe('/path/to/example.mov') do
+      options show_frames: true
+    end
+    
+    probe.format
+    probe.streams
+    probe.streams('audio')
+    probe.frames   # requires show_frames option
+    probe.metadata # => Hash
     
 ## Contributing
 

data/lib/media.rb

@@ -15,6 +15,10 @@ module Media
     Media::Command::Converter.new(&block)
   end
   
+  def probe(url, &block)
+    Media::Container.new(url: url, &block)
+  end
+  
   def size(args)
     Media::Helper::Size.new(args)
   end

data/lib/media/container.rb

@@ -7,31 +7,44 @@ require_relative 'option'
 module Media
   class Container
     
-    attr_reader :url, :options
+    attr_reader :url
     
-    def initialize(args)
-      @url   = args.fetch(:url)
+    def initialize(args, &block)
+      @url   = args.fetch(:url) { raise ':url required'}
       @probe = args.fetch(:probe, Command::Probe)
-      @options = args.fetch(:options, []) + required_options
+      @options = args.fetch(:options, [])
+      
+      block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
+    end
+    
+    def options(value=nil)
+      return @options + required_options unless value
+        
+      @options = value.map {|k,v| Option.new(key: k, value: v)}
     end
+    alias_method :options=, :options
     
     def format
       OpenStruct.new(metadata['format'])
     end
     
-    def streams(args={})
-      type = args.fetch(:type, /.*/)
-      
+    def streams(type=/.*/)      
       metadata['streams'].select {|s| s['codec_type'].match(type)}.
         map {|s| OpenStruct.new(s)}
     end
     
-    private
+    def frames
+      warn 'show_frames option required' unless metadata['frames']
+      
+      Array(metadata['frames']).map {|s| OpenStruct.new(s)}
+    end
     
     def metadata
       @metadata ||= JSON.parse(probe.out)
     end
     
+    private
+    
     def probe
       @probe.new(input: @url, options: options).call
     end

data/lib/media/filter.rb

@@ -8,10 +8,11 @@ module Media
     attr_reader :name
     
     def initialize(args, &block)
-      @name      = args.fetch(:name)
-      @arguments = Array args.fetch(:arguments, [])
-      @inputs    = Array args.fetch(:inputs, [])
-      @outputs   = Array args.fetch(:outputs, [])
+      @name        = args.fetch(:name)
+      @expressions = Array args.fetch(:expressions, [])
+      @arguments   = Array args.fetch(:arguments, [])
+      @inputs      = Array args.fetch(:inputs, [])
+      @outputs     = Array args.fetch(:outputs, [])
       
       block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
     end
@@ -41,10 +42,23 @@ module Media
     end
     alias_method :arguments=, :arguments
     
+    def expressions(*value)
+      return @expressions if value.empty?
+      
+      @expressions = value
+    end
+    alias_method :expressions=, :expressions
+    
     private
     
     def filter
-      [name, arguments.join(':')].reject(&:empty?).join('=')
+      [
+        name,
+        [
+          expressions.join(':'), 
+          arguments.join(':')
+        ].reject(&:empty?).join('::')
+      ].reject(&:empty?).join('=')
     end
   end
 end

data/lib/media/version.rb

@@ -1,3 +1,3 @@
 module Media
-  VERSION = '0.0.4'
+  VERSION = '0.0.6'
 end

data/test/media/test_filter.rb

@@ -6,13 +6,14 @@ module Media
     
     def test_to_s
       filter = Filter.new(
-        name: 'name', 
+        name: 'name',
+        expressions: 'expressions', 
         arguments: 'arguments', 
         inputs: 'inputs',
         outputs: 'outputs'
       )
       
-      assert_equal('inputs name=arguments outputs', filter.to_s)
+      assert_equal('inputs name=expressions::arguments outputs', filter.to_s)
     end
   end
 end

metadata

@@ -1,48 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: media
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Jamie Hodge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 description: FFMPEG/AVConv wrapper
 email:
 - jamiehodge@me.com
@@ -50,130 +45,75 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- !binary |-
-  LmdpdGlnbm9yZQ==
-- !binary |-
-  R2VtZmlsZQ==
-- !binary |-
-  TElDRU5TRS50eHQ=
-- !binary |-
-  UkVBRE1FLm1k
-- !binary |-
-  UmFrZWZpbGU=
-- !binary |-
-  bGliL21lZGlhLnJi
-- !binary |-
-  bGliL21lZGlhL2NvbW1hbmQucmI=
-- !binary |-
-  bGliL21lZGlhL2NvbW1hbmQvY29udmVydGVyLnJi
-- !binary |-
-  bGliL21lZGlhL2NvbW1hbmQvcHJvYmUucmI=
-- !binary |-
-  bGliL21lZGlhL2NvbW1hbmQvcHJvZ3Jlc3MucmI=
-- !binary |-
-  bGliL21lZGlhL2NvbW1hbmQvc3Vic2hlbGwucmI=
-- !binary |-
-  bGliL21lZGlhL2NvbnRhaW5lci5yYg==
-- !binary |-
-  bGliL21lZGlhL2ZpbHRlci5yYg==
-- !binary |-
-  bGliL21lZGlhL2ZpbHRlci9hcmd1bWVudC5yYg==
-- !binary |-
-  bGliL21lZGlhL2ZpbHRlci9jaGFpbi5yYg==
-- !binary |-
-  bGliL21lZGlhL2ZpbHRlci9ncmFwaC5yYg==
-- !binary |-
-  bGliL21lZGlhL2hlbHBlci5yYg==
-- !binary |-
-  bGliL21lZGlhL2hlbHBlci9sYWJlbC5yYg==
-- !binary |-
-  bGliL21lZGlhL2hlbHBlci9zaXplLnJi
-- !binary |-
-  bGliL21lZGlhL2lucHV0LnJi
-- !binary |-
-  bGliL21lZGlhL29wdGlvbi5yYg==
-- !binary |-
-  bGliL21lZGlhL291dHB1dC5yYg==
-- !binary |-
-  bGliL21lZGlhL3ZlcnNpb24ucmI=
-- !binary |-
-  bWVkaWEuZ2Vtc3BlYw==
-- !binary |-
-  dGVzdC9oZWxwZXIucmI=
-- !binary |-
-  dGVzdC9tZWRpYS9jb21tYW5kL3Rlc3RfY29udmVydGVyLnJi
-- !binary |-
-  dGVzdC9tZWRpYS9jb21tYW5kL3Rlc3RfcHJvYmUucmI=
-- !binary |-
-  dGVzdC9tZWRpYS9jb21tYW5kL3Rlc3Rfc3Vic2hlbGwucmI=
-- !binary |-
-  dGVzdC9tZWRpYS9maWx0ZXIvdGVzdF9hcmd1bWVudC5yYg==
-- !binary |-
-  dGVzdC9tZWRpYS9maWx0ZXIvdGVzdF9jaGFpbi5yYg==
-- !binary |-
-  dGVzdC9tZWRpYS9maWx0ZXIvdGVzdF9ncmFwaC5yYg==
-- !binary |-
-  dGVzdC9tZWRpYS9oZWxwZXIvdGVzdF9sYWJlbC5yYg==
-- !binary |-
-  dGVzdC9tZWRpYS90ZXN0X2ZpbHRlci5yYg==
-- !binary |-
-  dGVzdC9tZWRpYS90ZXN0X2lucHV0LnJi
-- !binary |-
-  dGVzdC9tZWRpYS90ZXN0X29wdGlvbi5yYg==
-- !binary |-
-  dGVzdC9tZWRpYS90ZXN0X291dHB1dC5yYg==
+- .gitignore
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- lib/media.rb
+- lib/media/command.rb
+- lib/media/command/converter.rb
+- lib/media/command/probe.rb
+- lib/media/command/progress.rb
+- lib/media/command/subshell.rb
+- lib/media/container.rb
+- lib/media/filter.rb
+- lib/media/filter/argument.rb
+- lib/media/filter/chain.rb
+- lib/media/filter/graph.rb
+- lib/media/helper.rb
+- lib/media/helper/label.rb
+- lib/media/helper/size.rb
+- lib/media/input.rb
+- lib/media/option.rb
+- lib/media/output.rb
+- lib/media/version.rb
+- media.gemspec
+- test/helper.rb
+- test/media/command/test_converter.rb
+- test/media/command/test_probe.rb
+- test/media/command/test_subshell.rb
+- test/media/filter/test_argument.rb
+- test/media/filter/test_chain.rb
+- test/media/filter/test_graph.rb
+- test/media/helper/test_label.rb
+- test/media/test_filter.rb
+- test/media/test_input.rb
+- test/media/test_option.rb
+- test/media/test_output.rb
 homepage: https://github.com/jamiehodge/media
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2002549777813010636
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2002549777813010636
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: FFMPEG/AVConv wrapper
 test_files:
-- !binary |-
-  dGVzdC9oZWxwZXIucmI=
-- !binary |-
-  dGVzdC9tZWRpYS9jb21tYW5kL3Rlc3RfY29udmVydGVyLnJi
-- !binary |-
-  dGVzdC9tZWRpYS9jb21tYW5kL3Rlc3RfcHJvYmUucmI=
-- !binary |-
-  dGVzdC9tZWRpYS9jb21tYW5kL3Rlc3Rfc3Vic2hlbGwucmI=
-- !binary |-
-  dGVzdC9tZWRpYS9maWx0ZXIvdGVzdF9hcmd1bWVudC5yYg==
-- !binary |-
-  dGVzdC9tZWRpYS9maWx0ZXIvdGVzdF9jaGFpbi5yYg==
-- !binary |-
-  dGVzdC9tZWRpYS9maWx0ZXIvdGVzdF9ncmFwaC5yYg==
-- !binary |-
-  dGVzdC9tZWRpYS9oZWxwZXIvdGVzdF9sYWJlbC5yYg==
-- !binary |-
-  dGVzdC9tZWRpYS90ZXN0X2ZpbHRlci5yYg==
-- !binary |-
-  dGVzdC9tZWRpYS90ZXN0X2lucHV0LnJi
-- !binary |-
-  dGVzdC9tZWRpYS90ZXN0X29wdGlvbi5yYg==
-- !binary |-
-  dGVzdC9tZWRpYS90ZXN0X291dHB1dC5yYg==
+- test/helper.rb
+- test/media/command/test_converter.rb
+- test/media/command/test_probe.rb
+- test/media/command/test_subshell.rb
+- test/media/filter/test_argument.rb
+- test/media/filter/test_chain.rb
+- test/media/filter/test_graph.rb
+- test/media/helper/test_label.rb
+- test/media/test_filter.rb
+- test/media/test_input.rb
+- test/media/test_option.rb
+- test/media/test_output.rb