ffmprb 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7ad97d1cd5c5f9689791939bac8be4036bba88e
-  data.tar.gz: fa917b25a9eb5756515ce122a842ca267057f8e3
+  metadata.gz: 191c7811867d45ef87f8256b249142c64fd9d566
+  data.tar.gz: 9b9bd63d84fe2b8b0df0acb32c3905686addf79d
 SHA512:
-  metadata.gz: 8c2c21e9616b2cb086d211d8e8f4f973764e7c950a664a20d36dfdc84ece7e4250a69413883b19fd826ff0af6d5b4df462f8c4223ca38ea48c0a4dda3697c497
-  data.tar.gz: 2e51ac9a3da91b19a1ae643425777db4bcd3ec4d88cf1fecf2f8850b7a62b3581760b5745de931e6cbcd80d48fc271cb4644ac76b1daa2a334aeb197c2c59749
+  metadata.gz: 48a577a5ff1635a741325ad7ee72d74a41ab3fc35320cf9e05888e8b073752ccc1567e861eb59e506ae049096a4881cc2abec0f0f36988c21d8270ed91305944
+  data.tar.gz: 3e060ba0f8e3b3325aad8cf063cf06c4cd93f6d176b1e51a14a910602ece387e1f6ed2eb4b78a76d8116eed389dad741e017fc246d6be3d3cb9d7565c1d4d94e

data/lib/defaults.rb

@@ -1,5 +1,9 @@
 module Ffmprb
 
+  File.image_extname_regex = /^\.(jpe?g|a?png|y4m)$/i
+  File.sound_extname_regex = /^\.(mp3|wav)$/i
+  File.movie_extname_regex = /^\.(mp4|flv|mov)$/i
+
   Filter.silence_noise_max_db = -40
 
   Process.duck_audio_silent_min = 3

data/lib/ffmprb/file.rb

@@ -8,6 +8,8 @@ module Ffmprb
 
     class << self
 
+      attr_accessor :image_extname_regex, :sound_extname_regex, :movie_extname_regex
+
       def threaded_buffered_fifo(extname='.tmp')
         input_fifo_file = temp_fifo(extname)
         output_fifo_file = temp_fifo(extname)
@@ -84,6 +86,18 @@ module Ffmprb
         }
       end
 
+      def image?(extname)
+        extname =~ image_extname_regex
+      end
+
+      def sound?(extname)
+        extname =~ sound_extname_regex
+      end
+
+      def movie?(extname)
+        extname =~ movie_extname_regex
+      end
+
     end
 
 
@@ -112,9 +126,9 @@ module Ffmprb
     def channel?(medium)
       case medium
       when :video
-        image_extname? || movie_extname?
+        self.class.image?(extname) || self.class.movie?(extname)
       when :audio
-        sound_extname? || movie_extname?
+        self.class.sound?(extname) || self.class.movie?(extname)
       end
     end
 
@@ -173,18 +187,6 @@ module Ffmprb
       end
     end
 
-    def image_extname?
-      extname =~ /^\.(jpe?g|a?png|y4m)$/i
-    end
-
-    def sound_extname?
-      extname =~ /^\.(mp3|wav)$/i
-    end
-
-    def movie_extname?
-      extname =~ /^\.(mp4|flv)$/i
-    end
-
   end
 
 end

data/lib/ffmprb/process/output.rb

@@ -6,8 +6,18 @@ module Ffmprb
 
       class << self
 
-        def audio_cmd_options(audio=Process.output_audio_options)
-          audio ||= {}
+        # XXX check for unknown options
+
+        def video_cmd_options(video=nil)
+          video = Process.output_video_options.merge(video.to_h || {})
+          [].tap do |options|
+            options.concat %W[-c:v #{video[:encoder]}]  if video[:encoder]
+            options.concat %W[-pix_fmt #{video[:pixel_format]}]  if video[:pixel_format]
+          end
+        end
+
+        def audio_cmd_options(audio=nil)
+          audio = Process.output_audio_options.merge(audio.to_h || {})
           [].tap do |options|
             options.concat %W[-c:a #{audio[:encoder]}]  if audio[:encoder]
           end
@@ -278,6 +288,7 @@ module Ffmprb
           channel_lbls.each do |channel_lbl|
             options << '-map' << "[#{channel_lbl}]"
           end
+          options.concat self.class.video_cmd_options(channel :video)  if channel? :video
           options.concat self.class.audio_cmd_options(channel :audio)  if channel? :audio
           options << io.path
         end

data/lib/ffmprb/version.rb

@@ -1,3 +1,3 @@
 module Ffmprb
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffmprb
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - showbox.com
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mkfifo