av 0.0.6 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fba45a60d49e120bdaf9d2e27d2b6a82353f35e
-  data.tar.gz: 06a7fc08a643988726ce5ac463f6758cd27e69f4
+  metadata.gz: c457580a1a913b757c7451679a5ee05779b1e180
+  data.tar.gz: 789e34475f417dbf0371f7bc2bc6e7ec2ac655fa
 SHA512:
-  metadata.gz: d6b7f5ffc96ca1dc66bd591b440381e253045d506cb17b51c90791b073bc124865e27b0c6879ad914839891848bda7fd3a095a3741a11d5a03caaa8077cfe0c1
-  data.tar.gz: 8e2f30438d202dcf0da6c80bfded898d83fd357f3c8040b01ad11d84ebb6ab52222fc894ad17b3beff4741a70812ad52e0daa89b08307fdf0459486ff2a24ce0
+  metadata.gz: 80d293f42ba494f35559df9f09a914cd59d60036be5e95ce83e2c906d07eafeacd3c78e17bb814797931984a58ecc78e3538923fd7dbb46b8f58e96bca90aebc
+  data.tar.gz: 2e5e1d55dbd04928f20a282115a8afe217e1cfb93175c610b1c585393f6cbefa8e9a6db412bbf976753da0053952b11e9ef213ff97abdd0a899a72462f019391

data/lib/av.rb

@@ -1,6 +1,7 @@
 require "av/version"
 require "av/exceptions"
 require "av/cli"
+require "av/param_hash"
 require "av/commands/ffmpeg"
 require "av/commands/avconv"
 require "cocaine"
@@ -8,17 +9,12 @@ require "cocaine"
 module Av
   extend self
   
-  def cli
-    ::Av::Cli.new
-  end
-  
-  def quiet
-    return @quiet if @quiet
-    true
+  def cli(options = {})
+    ::Av::Cli.new(options)
   end
   
   def run line, codes = [0]
-    Av.log("Running command: #{line}")
+    ::Av.log("Running command: #{line}")
     begin
       Cocaine::CommandLine.new(line, "", expected_outcodes: codes).run
     rescue Cocaine::ExitStatusError => e
@@ -29,15 +25,4 @@ module Av
   def log message
     puts "[AV] #{message}"
   end
-  
-  def detect_command(command)
-    command = "if command -v #{command} 2>/dev/null; then echo \"true\"; else echo \"false\"; fi"
-    result = Av.run(command)
-    case result
-      when /true/
-        return true
-      when /false/
-        return false
-    end
-  end
 end

data/lib/av/cli.rb

@@ -2,23 +2,32 @@ module Av
   class Cli
     attr_accessor :command
     
-    def initialize
+    def initialize(options)
       found = []
-      found << 'ffmpeg' if ::Av.detect_command('ffmpeg')
-      found << 'avconv' if ::Av.detect_command('avprobe')
-      ::Av.log("Found: #{found.inspect}")
+      found << 'ffmpeg' if self.detect_command('ffmpeg')
+      found << 'avconv' if self.detect_command('avprobe')
       if found.empty?
         raise Av::UnableToDetect, "Unable to detect any supported library"
       else
-        found.each do |library|
-          @command = Object.const_get('Av').const_get('Commands').const_get(library.capitalize).new
-        end
+        @command = Object.const_get('Av').const_get('Commands').const_get(found.first.capitalize).new(options)
       end
+      ::Av.log("Found #{found.inspect}, using: #{found.first.capitalize}")
     end
-
+    
     protected
       def method_missing name, *args, &block
         @command.send(name, *args, &block)
       end
+  
+      def detect_command(command)
+        command = "if command -v #{command} 2>/dev/null; then echo \"true\"; else echo \"false\"; fi"
+        result = ::Av.run(command)
+        case result
+          when /true/
+            return true
+          when /false/
+            return false
+        end
+      end
   end
 end

data/lib/av/commands/avconv.rb

@@ -4,21 +4,34 @@ module Av
   module Commands
     class Avconv < Base
       
-      def initialize
-        super
-        @command_name = "avconv"
-        @default_params = %Q(-loglevel "quiet") if Av.quiet
+      def initialize(options = {})
+        super(options)
+        @command_name = 'avconv'
+        @default_params['loglevel'] = 'quiet' unless options[:quite] == false
       end
       
       def filter_concat list
-        @input_params << %Q(-i concat:#{list.join('\|')} -c copy)
+        add_input_param i: "concat:#{list.join('\|')} -c copy"
         self
       end
       
       def filter_volume vol
-        @input_params << "-af volume=volume=#{vol}"
+        add_input_param af: "volume=volume=#{vol}"
         self
       end
+      
+      def filter_rotate degrees
+        raise ::Av::InvalidFilterParameter unless degrees % 90 == 0
+        case degrees
+          when 90
+            add_input_param vf: 'clock'
+          when 180
+            add_input_param vf: 'vflip,hflip'
+          when 270
+            add_input_param vf: 'cclock'
+        end
+      end
+      
     end
   end
 end

data/lib/av/commands/base.rb

@@ -4,18 +4,22 @@ module Av
   module Commands
     # Common features across commands
     class Base
+      attr_accessor :options
       attr_accessor :command_name
       attr_accessor :input_params
       attr_accessor :output_params
+      attr_accessor :audio_filters
+      attr_accessor :video_filters
       attr_accessor :default_params
 
       attr_accessor :source
       attr_accessor :destination
       
-      def initialize
+      def initialize(options = {})
         reset_input_filters
         reset_output_filters
         reset_default_filters
+        @options = options
       end
       
       def add_source src
@@ -27,60 +31,65 @@ module Av
       end
       
       def reset_input_filters
-        @input_params = []
+        @input_params = ParamHash.new
+        @audio_filters = ParamHash.new
+        @video_filters = ParamHash.new
       end
       
       def reset_output_filters
-        @output_params = []
+        @output_params = ParamHash.new
       end
       
       def reset_default_filters
-        @output_params = []
+        @default_params = ParamHash.new
       end
       
-      def add_input_filters hash
-        hash.each do |k,v|
-          @input_params << "-#{k} #{v}"
-        end
+      def add_input_param *param
+        p = parse_param(param)
+        ::Av.log "Adding input parameter #{p}"
+        @input_params[p[0]] = [] unless @input_params.has_key?(p[0])
+        @input_params[p[0]] << p[1]
         self
       end
       
-      def add_output_filters hash
-        hash.each do |k,v|
-          @output_params << "-#{k} #{v}"
-        end
+      def set_input_params hash
+        @input_params = hash
+      end
+      
+      def add_output_param *param
+        p = parse_param(param)
+        ::Av.log "Adding output parameter #{p}"
+        @output_params[p[0]] = [] unless @output_params.has_key?(p[0])
+        @output_params[p[0]] << p[1]
         self
       end
       
-      def command_line
+      def set_output_params hash
+        @output_params = hash
+      end
+      
+      def run
         raise Av::CommandError if (@source.nil? && @destination.nil?) || @command_name.nil?
 
         parameters = []
         parameters << @command_name
         parameters << @default_params if @default_params
         if @input_params
-          parameters << @input_params.join(' ')
+          parameters << @input_params.to_s
         end
         parameters << %Q(-i "#{@source}") if @source
         if @output_params
-          parameters << @output_params.join(' ')
+          parameters << @output_params.to_s
         end
         parameters << %Q(-y "#{@destination}") if @destination
-        parameters.flatten.compact.join(" ").strip.squeeze(" ")
-      end
-    
-      def run
-        Av.run(command_line)
+        command_line = parameters.flatten.compact.join(" ").strip.squeeze(" ")
+        ::Av.run(command_line)
       end
       
       def identify path
         meta = {}
         command = %Q(#{@command_name} -i "#{File.expand_path(path)}" 2>&1)
-        out = Av.run(command, [0,1])
-        # rescue Av::CommandError
-        #   # Do nothing, we know ffmpeg/avconv will complain with:
-        #   # "At least one output file must be specified"
-        # end
+        out = ::Av.run(command, [0,1])
         out.split("\n").each do |line|
           if line =~ /(([\d\.]*)\s.?)fps,/
             meta[:fps] = $1.to_i
@@ -103,6 +112,45 @@ module Av
         end
         meta
       end
+      
+      def output_format format
+        case format
+        when 'jpg', 'jpeg', 'png', 'gif' # Images
+          add_output_param 'f', 'image2'
+          add_output_param 'vframes', '1'
+        when 'webm' # WebM
+          add_output_param 'f', 'webm'
+          add_output_param 'acodec', 'libvorbis'
+          add_output_param 'vcodec', 'libvpx'
+        when 'ogv' # Ogg Theora
+          add_output_param 'f', 'ogg'
+          add_output_param 'acodec', 'libvorbis'
+          add_output_param 'vcodec', 'libtheora'
+        when 'mp4'
+          add_output_param 'acodec', 'aac'
+          add_output_param 'strict', 'experimental'
+        end
+      end
+      
+      # Children should override the following methods
+      def filter_rotate degrees
+        raise ::Av::FilterNotImplemented, 'rotate'
+      end
+      
+      def parse_param param
+        list = []
+        if param.count == 2
+          list = param
+        elsif param.count == 1
+          case param[0].class.to_s
+          when 'Hash'
+            list[0], list[1] = param[0].to_a.flatten!
+          when 'Array'
+            list = param[0]
+          end
+        end
+        list
+      end
     end  
   end
 end

data/lib/av/commands/ffmpeg.rb

@@ -5,9 +5,10 @@ module Av
   module Commands
     class Ffmpeg < Base
       
-      def initialize
-        super
+      def initialize(options = {})
+        super(options)
         @command_name = "ffmpeg"
+        # TODO handle quite for ffmpeg
       end
       
       def filter_concat list
@@ -17,12 +18,25 @@ module Av
             file.write("file '#{item}'\n")
           end
         end
-        @input_params << "concat -i #{index_file.path}"
+        add_input_param concat: "-i #{index_file.path}"
         self
       end
       
       def filter_volume vol
-        @input_params << "-af volume=#{vol}"
+        add_input_param af: "volume=#{vol}"
+        self
+      end
+      
+      def filter_rotate degrees
+        raise ::Av::InvalidFilterParameter unless degrees % 90 == 0
+        case degrees
+          when 90
+            add_input_param vf: 'transpose=1'
+          when 180
+            add_input_param vf: 'vflip,hflip'
+          when 270
+            add_input_param vf: 'transpose=2'
+        end
         self
       end
     end

data/lib/av/exceptions.rb

@@ -3,4 +3,6 @@ module Av
   class CommandError < Exception; end
   class InvalidInputFile < Exception; end
   class InvalidOutputFile < Exception; end
+  class InvalidFilterParameter < Exception; end
+  class FilterNotImplemented < Exception; end
 end

data/lib/av/param_hash.rb

@@ -0,0 +1,12 @@
+module Av
+  class ParamHash < Hash
+    def to_s
+      line = []
+      self.each do |option, value|
+        value = value.join(' ') unless value.is_a?(String)
+        line << "-#{option} #{value}"
+      end
+      line.join(' ')
+    end
+  end
+end

data/lib/av/version.rb

@@ -1,3 +1,3 @@
 module Av
-  VERSION = "0.0.6"
+  VERSION = "0.1.1"
 end

data/spec/av/avconv_spec.rb

@@ -9,7 +9,7 @@ describe Av::Commands::Avconv do
       subject.filter_concat(list)
     end
     
-    it { expect(subject.input_params.first).to include %Q(concat:one\\|two) }
+    it { expect(subject.input_params.to_s).to include %Q(concat:one\\|two) }
   end
 
   describe '.filter_volume' do
@@ -17,7 +17,7 @@ describe Av::Commands::Avconv do
       subject.filter_volume('0.5')
     end
     
-    it { expect(subject.input_params.first).to eq "-af volume=volume=0.5" }
+    it { expect(subject.input_params.to_s).to eq "-af volume=volume=0.5" }
   end
 end
 

data/spec/av/base_spec.rb

@@ -10,5 +10,45 @@ describe Av::Commands::Base do
     it { expect(meta).to be_a Hash }
     it { expect(meta.keys).to include :size, :fps, :length, :aspect }
   end
+  
+  describe '.add_input_param' do
+    before do
+      subject.add_input_param({k: 'value'})
+    end
+    it { expect(subject.input_params.to_s).to eq '-k value' }
+    context 'multiple calls' do
+      before do
+        subject.add_input_param({k: 'value1'})
+        subject.add_input_param(:k, 'value2')
+        subject.add_input_param([:x, 'y'])
+      end
+      it { expect(subject.input_params.to_s).to eq '-k value value1 value2 -x y' }
+    end
+  end
+
+  describe '.add_output_param' do
+    before do
+      subject.add_output_param({k: 'value'})
+    end
+    it { expect(subject.output_params.to_s).to eq '-k value' }
+    context 'multiple calls' do
+      before do
+        subject.add_output_param({k: 'value1'})
+        subject.add_output_param(:k, 'value2')
+        subject.add_output_param([:x, 'y'])
+      end
+      it { expect(subject.output_params.to_s).to eq '-k value value1 value2 -x y' }
+    end
+  end
+  
+  describe '.run' do
+    before do
+      subject.add_output_param(ar: 44100)
+      subject.add_source(source)
+      subject.add_destination(Tempfile.new(['one', '.ogv']).path)
+    end
+    it { expect { subject.run }.not_to raise_exception }
+    
+  end
 end
 

data/spec/av/ffmpeg_spec.rb

@@ -9,7 +9,7 @@ describe Av::Commands::Ffmpeg do
       subject.filter_concat(list)
     end
     
-    it { expect(subject.input_params.first).to include %Q(concat -i) }
+    it { expect(subject.input_params.to_s).to include %Q(concat -i) }
   end
 
   describe '.filter_volume' do
@@ -17,6 +17,6 @@ describe Av::Commands::Ffmpeg do
       subject.filter_volume('0.5')
     end
     
-    it { expect(subject.input_params.first).to eq "-af volume=0.5" }
+    it { expect(subject.input_params.to_s).to eq "-af volume=0.5" }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: av
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.1
 platform: ruby
 authors:
 - Omar Abdel-Wahab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,6 +86,7 @@ files:
 - lib/av/commands/base.rb
 - lib/av/commands/ffmpeg.rb
 - lib/av/exceptions.rb
+- lib/av/param_hash.rb
 - lib/av/version.rb
 - spec/av/av_spec.rb
 - spec/av/avconv_spec.rb