av 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75444062e1b869f7ee104f74d2f4db4e3896ef92
-  data.tar.gz: dd8fad78bb0571d02cb27fbf95827909a3f0f577
+  metadata.gz: 4eb96469037b44a476417432ba11e3487c8e5d48
+  data.tar.gz: 1beaccbfdc03404ab940ec6f0a9dac36e2cfcd0c
 SHA512:
-  metadata.gz: f55ff0bb7bec672f7643183db7e1de02367af251677e3f8bc75884b6f95112b87eee1c99ea7815d54facfac7b01111de0b83873b97a663a0ffb540015405895f
-  data.tar.gz: 24448d70ddabe3af39e21cbaebbbe3483475bda29ff8cd39018e2cab3f8948046ad8b060b9dff9a92ceb49c658abfa091fd9bce41e5a8178ea48315140dd2d0f
+  metadata.gz: 378c8cf269006953df35555e2c36438b2cd82a565fe5c1bf72a46aed469cbb92097519dbddbe26a9f728b8df98ac32bd915f5dea53c7818dc2d0dfb69ef5329b
+  data.tar.gz: bff6b5805a553aa1a62d2abf3e6ae365f124b0e75f12ecd476fe9f4fe8cc7f8fdf67d89f85c2326f0e31bca41bf4a6f9161d1b76d1a7f873f90553af2311f53b

data/lib/av.rb

@@ -18,10 +18,10 @@ module Av
     true
   end
   
-  def run line
+  def run line, codes = [0]
     Av.log("Running command: #{line}")
     begin
-      Cocaine::CommandLine.new(line).run
+      Cocaine::CommandLine.new(line, "", expected_outcodes: codes).run
     rescue Cocaine::ExitStatusError => e
       raise Av::CommandError, "error while running command #{line}: #{e}"
     end

data/lib/av/commands/avconv.rb

@@ -10,10 +10,14 @@ module Av
         @default_params = %Q(-loglevel "quiet") if Av.quiet
       end
       
-      def input_concat list
+      def filter_concat list
         @input_params << %Q(-i concat:#{list.join('\|')} -c copy)
         self
       end
+      
+      def filter_volume vol
+        @input_params << "-af volume=volume=#{vol}"
+      end
     end
   end
 end

data/lib/av/commands/base.rb

@@ -46,6 +46,37 @@ module Av
       def run
         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.split("\n").each do |line|
+          if line =~ /(([\d\.]*)\s.?)fps,/
+            meta[:fps] = $1.to_i
+          end
+          # Matching lines like:
+          # Video: h264, yuvj420p, 640x480 [PAR 72:72 DAR 4:3], 10301 kb/s, 30 fps, 30 tbr, 600 tbn, 600 tbc
+          if line =~ /Video:(.*)/
+             v = $1.to_s
+             size = v.match(/\d{3,5}x\d{3,5}/).to_s
+             meta[:size] = size
+             meta[:aspect] = size.split('x').first.to_f / size.split('x').last.to_f
+           end
+          # Matching Duration: 00:01:31.66, start: 0.000000, bitrate: 10404 kb/s
+          if line =~ /Duration:(\s.?(\d*):(\d*):(\d*\.\d*))/
+            meta[:length] = $2.to_s + ":" + $3.to_s + ":" + $4.to_s
+          end
+          if line =~ /rotate\s*:\s(\d*)/
+            meta[:rotate] = $1.to_i
+          end
+        end
+        meta
+      end
     end  
   end
 end

data/lib/av/commands/ffmpeg.rb

@@ -10,7 +10,7 @@ module Av
         @command_name = "ffmpeg"
       end
       
-      def input_concat list
+      def filter_concat list
         index_file = Tempfile.new('ffmpeg-concat')
         File.open(index_file, 'w') do |file|
           list.each do |item|
@@ -20,6 +20,10 @@ module Av
         @input_params << "concat -i #{index_file.path}"
         self
       end
+      
+      def filter_volume vol
+        @input_params << "-af volume=#{vol}"
+      end
     end
   end
 end

data/lib/av/version.rb

@@ -1,3 +1,3 @@
 module Av
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/av/avconv_spec.rb

@@ -4,12 +4,20 @@ describe Av::Commands::Avconv do
   let(:subject) { Av::Commands::Avconv.new }
   let(:list) { ['one', 'two'] }
   
-  describe '.input_concat' do
+  describe '.filter_concat' do
     before do
-      subject.input_concat(list)
+      subject.filter_concat(list)
     end
     
     it { expect(subject.input_params.first).to include %Q(concat:one\\|two) }
   end
+
+  describe '.filter_volume' do
+    before do
+      subject.filter_volume('0.5')
+    end
+    
+    it { expect(subject.input_params.first).to eq "-af volume=volume=0.5" }
+  end
 end
 

data/spec/av/base_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Av::Commands::Base do
+  let(:subject) { Av.cli }
+  let(:source) { File.new(Dir.pwd + '/spec/support/assets/sample.mp4').path }
+  
+  describe '.identify' do
+    let(:meta) { subject.identify source }
+    
+    it { expect(meta).to be_a Hash }
+    it { expect(meta.keys).to include :size, :fps, :length, :aspect }
+  end
+end
+

data/spec/av/ffmpeg_spec.rb

@@ -4,11 +4,19 @@ describe Av::Commands::Ffmpeg do
   let(:subject) { Av::Commands::Ffmpeg.new }
   let(:list) { ['one', 'two'] }
   
-  describe '.input_concat' do
+  describe '.filter_concat' do
     before do
-      subject.input_concat(list)
+      subject.filter_concat(list)
     end
     
     it { expect(subject.input_params.first).to include %Q(concat -i) }
   end
+
+  describe '.filter_volume' do
+    before do
+      subject.filter_volume('0.5')
+    end
+    
+    it { expect(subject.input_params.first).to eq "-af volume=0.5" }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: av
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Omar Abdel-Wahab
@@ -87,6 +87,7 @@ files:
 - lib/av/version.rb
 - spec/av/av_spec.rb
 - spec/av/avconv_spec.rb
+- spec/av/base_spec.rb
 - spec/av/ffmpeg_spec.rb
 - spec/spec_helper.rb
 - spec/support/assets/sample.mp4
@@ -117,6 +118,7 @@ summary: Programmable Ruby interface for FFMPEG/Libav
 test_files:
 - spec/av/av_spec.rb
 - spec/av/avconv_spec.rb
+- spec/av/base_spec.rb
 - spec/av/ffmpeg_spec.rb
 - spec/spec_helper.rb
 - spec/support/assets/sample.mp4