ffmprb 0.6.7 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89d245761d8d4cc634a01b2df4b24285d8d12442
-  data.tar.gz: 9f837994c17a2b7537b1047b2cf3228b26786bc8
+  metadata.gz: 3c63aad2be1497ee10ff566dafaa5a76f7e8cc87
+  data.tar.gz: 0b6b1f15cd314f7b51fc7dbddb3b9c37f47dcdfe
 SHA512:
-  metadata.gz: 925d6aaea191371123fe2bfa6df96ec30a2c33469f3804881c794400e8ab3681b08c9fecce3c2008702a3c9e183aa5c79fd4500569acf85a8aa7fb099fdd6659
-  data.tar.gz: 75ccb1c89e17601d9f3c5bf767dfb9b0a88810fd8f6e74316984391ebbf3dfa5c15acda73868135e8ec0eea1e53b7a38aea1dff09589f396bee96b58d0681823
+  metadata.gz: 183ba570ca74223f6f5974a969ff9f2bd74fe5a8a099e34b429901773d76d7757d8c58fb8666d9444abedc5539d978b98ef22fa1c534bb9b7ba43a14665a9701
+  data.tar.gz: a9be63b31513b789f454931b0514c3b7601e01ac38ba71ee4a596cd82cab7b99b3547439303aace34595235e69b719550d3361830431d8091bb5df922a3c6e2b

data/lib/ffmprb/file.rb

@@ -131,10 +131,10 @@ module Ffmprb
       raise Error, "Incorrect audio extname (must be .mp3)"  unless !audio || audio.extname =~ /mp3$/
       raise Error, "Can sample either video OR audio UNLESS a block is given"  unless block_given? || (!!audio != !!video)
 
-      cmd = " -i #{path}"
-      cmd << " -deinterlace -an -ss #{at} -r 1 -vcodec mjpeg -f mjpeg #{video.path}"  if video
-      cmd << " -vn -ss #{at} -t 1 -f mp3 #{audio.path}"  if audio
-      Util.ffmpeg cmd
+      cmd = ['-i', path]
+      cmd += ['-deinterlace', '-an', '-ss', at, '-r', 1, '-vcodec', 'mjpeg', '-f', 'mjpeg', video.path]  if video
+      cmd += ['-vn', '-ss', at, '-t', 1, '-f', 'mp3', audio.path]  if audio
+      Util.ffmpeg *cmd
 
       return video || audio  unless block_given?
 
@@ -172,9 +172,9 @@ module Ffmprb
 
     def probe(force=false)
       return @probe  unless !@probe || force
-      cmd = " -v quiet -i #{path} -print_format json -show_format -show_streams"
-      cmd << " -show_frames"  if force
-      @probe = JSON.parse(Util::ffprobe cmd).tap do |probe|
+      cmd = ['-v', 'quiet', '-i', path, '-print_format', 'json', '-show_format', '-show_streams']
+      cmd << '-show_frames'  if force
+      @probe = JSON.parse(Util::ffprobe *cmd).tap do |probe|
         raise Error, "This doesn't look like a ffprobable file"  unless probe['streams']
       end
     end

data/lib/ffmprb/filter.rb

@@ -210,12 +210,8 @@ module Ffmprb
         inout filter, nil, output
       end
 
-      def complex_options(filters)
-        if filters.empty?
-          ''
-        else
-          " -filter_complex \"#{filters.join '; '}\""
-        end
+      def complex_options(*filters)
+        ['-filter_complex', filters.join('; ')]  unless filters.empty?
       end
 
       private

data/lib/ffmprb/process/input.rb

@@ -114,7 +114,7 @@ module Ffmprb
       end
 
       def options
-        " -i #{@io.path}"
+        ['-i', @io.path]
       end
 
       def filters_for(lbl, process:, video: true, audio: true)

data/lib/ffmprb/process/output.rb

@@ -238,9 +238,9 @@ module Ffmprb
           end
           io_channel_lbls.each do |io, channel_lbls|
             channel_lbls.each do |channel_lbl|
-              options << " -map \"[#{channel_lbl}]\""
+              options << '-map' << "[#{channel_lbl}]"
             end
-            options << " #{io.path}"
+            options << io.path
           end
 
         end

data/lib/ffmprb/process.rb

@@ -70,7 +70,7 @@ module Ffmprb
     end
 
     def run
-      Util.ffmpeg command
+      Util.ffmpeg *command
       @threaded.to_a.each &:join
     end
 
@@ -93,7 +93,7 @@ module Ffmprb
     end
 
     def input_options
-      @inputs.map(&:options).join
+      @inputs.map(&:options).flatten(1)
     end
 
     def output_options

data/lib/ffmprb/util.rb

@@ -10,28 +10,32 @@ module Ffmprb
 
     class << self
 
-      def ffprobe(args)
-        sh "ffprobe#{args}"
+      attr_accessor :ffmpeg_cmd, :ffprobe_cmd
+
+      def ffprobe(*args)
+        sh ffprobe_cmd, *args
       end
 
-      def ffmpeg(args)
-        args = " -loglevel debug#{args}"  if Ffmprb.debug
-        sh "ffmpeg -y#{args}", output: :stderr
+      def ffmpeg(*args)
+        args = ['-loglevel', 'debug'] + args  if Ffmprb.debug
+        sh ffmpeg_cmd, '-y', *args, output: :stderr
       end
 
-      def sh(cmd, output: :stdout, log: :stderr)
-        Ffmprb.logger.info cmd
-        Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
+      def sh(*cmd, output: :stdout, log: :stderr)
+        cmd = cmd.to_a.map(&:to_s)
+        cmd_str = cmd.join(' ')
+        Ffmprb.logger.info cmd_str
+        Open3.popen3(*cmd) do |stdin, stdout, stderr, wait_thr|
           stdin.close
 
           # XXX process timeouting/cleanup here will be appreciated
 
           begin
-            log_cmd = "#{cmd.split(' ').first.upcase}: "  if log
+            log_cmd = "#{(cmd.respond_to?(:first)? cmd : cmd.split(' ')).first.upcase}: "  if log
             stdout_r = Reader.new(stdout, output == :stdout, log == :stdout && log_cmd)
             stderr_r = Reader.new(stderr, true, log == :stderr && log_cmd)
 
-            raise Error, "#{cmd}:\n#{stderr_r.read}"  unless
+            raise Error, "#{cmd_str}:\n#{stderr_r.read}"  unless
               wait_thr.value.exitstatus == 0  # NOTE blocks
 
             # NOTE only one of them will return non-nil, see above
@@ -45,7 +49,7 @@ module Ffmprb
               Ffmprb.logger.error "Thread joining error: #{$!.message}"
               stderr_r.join  if stdout_r
             end
-            Ffmprb.logger.debug "FINISHED: #{cmd}"
+            Ffmprb.logger.debug "FINISHED: #{cmd_str}"
           end
         end
       end

data/lib/ffmprb/version.rb

@@ -1,3 +1,3 @@
 module Ffmprb
-  VERSION = "0.6.7"
+  VERSION = "0.6.9"
 end

data/lib/ffmprb.rb

@@ -19,6 +19,9 @@ module Ffmprb
   class Error < StandardError
   end
 
+  Util.ffmpeg_cmd = 'ffmpeg'
+  Util.ffprobe_cmd = 'ffprobe'
+
   Process.duck_audio_hi = 0.9
   Process.duck_audio_lo = 0.1
   Process.duck_audio_transition_sec = 1
@@ -59,9 +62,9 @@ module Ffmprb
     def find_silence(input_file, output_file)
       logger.debug "Finding silence (#{input_file.path}->#{output_file.path})"
       filters = Filter.silencedetect
-      options = " -i #{input_file.path}#{Filter.complex_options filters} #{output_file.path}"
+      options = ['-i', input_file.path, *Filter.complex_options(filters), output_file.path]
       silence = []
-      Util.ffmpeg(options).split("\n").each do |line|
+      Util.ffmpeg(*options).split("\n").each do |line|
         next  unless line =~ /^\[silencedetect\s.*\]\s*silence_(\w+):\s*(\d+\.?d*)/
         case $1
         when 'start'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffmprb
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.9
 platform: ruby
 authors:
 - showbox.com
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mkfifo