ffmprb 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cab9a42d86cde16665ecb56282e4539aacb44050
-  data.tar.gz: 3490a22eeb910ad2a4dc7ac621f3a8f8ecbd6e24
+  metadata.gz: 510aa0451bf42ca9dc3dad8268bc017cce41f331
+  data.tar.gz: 9abf39c9c5081038aecf607cf4c16fdc49788514
 SHA512:
-  metadata.gz: 260a73fdf0a94a9244892f9ea66d9608fcb365a5be1b6c61abe6a065ce1d783cb7b33f0467a44d1b0896c8e4aff1198ad3c427433e59f79375ce53882d919233
-  data.tar.gz: cbc7b19a6db51ca517863f9cd106e21042bfb59e84eb0cab080297ef620d33e4d86b67b19b198ddb032b0235702802eff63e120da07ab41b43f154f4321eaf73
+  metadata.gz: 364cbc89864751a3837cb6c2239a823bf964f948b3504b741754116744cd5e7e7981523e0d88d88e66b486d3c011dac9f572c6619e97985363887fe693c5e827
+  data.tar.gz: 25e2170a21c60ced85fc43fa6c33007782b981741c12377c2aedd1f7e67e626a8ebffa40b9b7eb92272b949f4f1872295dd0ce1887ef89fdcfd892fc613dd093

data/lib/defaults.rb

@@ -2,10 +2,12 @@ module Ffmprb
 
   Filter.silence_noise_max_db = -40
 
+  Process.duck_audio_silent_min = 3
+  Process.duck_audio_transition_length = 1
+  Process.duck_audio_transition_in_start = -0.4
+  Process.duck_audio_transition_out_start = -0.6
   Process.duck_audio_volume_hi = 0.9
   Process.duck_audio_volume_lo = 0.1
-  Process.duck_audio_transition_length = 1
-  Process.duck_audio_silent_min = 3
   Process.timeout = 15
 
   Util.ffmpeg_cmd = ['ffmpeg']

data/lib/ffmprb/find_silence.rb

@@ -5,7 +5,7 @@ module Ffmprb
     def find_silence(input_file, output_file)
       logger.debug "Finding silence (#{input_file.path}->#{output_file.path})"
       silence = []
-      Util.ffmpeg('-i', input_file.path, *silence_detect_options, output_file.path).
+      Util.ffmpeg('-i', input_file.path, *find_silence_detect_options, output_file.path).
         scan(SILENCE_DETECT_REGEX).each do |mark, time|
         time = time.to_f
 
@@ -31,8 +31,8 @@ module Ffmprb
 
     SILENCE_DETECT_REGEX = /\[silencedetect\s.*\]\s*silence_(\w+):\s*(\d+\.?d*)/
 
-    def silence_detect_options
-      @silence_detect_options ||= Filter.complex_options(Filter.silencedetect)
+    def find_silence_detect_options
+      Filter.complex_options Filter.silencedetect
     end
 
   end

data/lib/ffmprb/process.rb

@@ -4,8 +4,10 @@ module Ffmprb
 
     class << self
 
-      attr_accessor :duck_audio_volume_hi, :duck_audio_volume_lo
-      attr_accessor :duck_audio_silent_min, :duck_audio_transition_length
+      attr_accessor :duck_audio_volume_hi, :duck_audio_volume_lo,
+        :duck_audio_silent_min
+      attr_accessor :duck_audio_transition_length,
+        :duck_audio_transition_in_start, :duck_audio_transition_out_start
 
       attr_accessor :timeout
 
@@ -23,7 +25,7 @@ module Ffmprb
 
       def duck_audio(av_main_i, a_overlay_i, silence, av_main_o,
         volume_lo: duck_audio_volume_lo, volume_hi: duck_audio_volume_hi,
-        silent_min: duck_audio_silent_min, transition_length: duck_audio_transition_length,
+        silent_min: duck_audio_silent_min,
         video: {resolution: Ffmprb::CGA, fps: 30}  # XXX temporary
         )
         Ffmprb.process(av_main_i, a_overlay_i, silence, av_main_o) do |main_input, overlay_input, duck_data, main_output|
@@ -37,14 +39,16 @@ module Ffmprb
             duck_data.each do |silent|
               next  if silent.end_at && silent.start_at && (silent.end_at - silent.start_at) < silent_min
 
+              transition_in_start = silent.start_at + Process.duck_audio_transition_in_start
               ducked_overlay_volume.merge!(
-                [silent.start_at - transition_length/2, 0.0].max => volume_lo,
-                (silent.start_at + transition_length/2) => volume_hi
+                [transition_in_start, 0.0].max => volume_lo,
+                (transition_in_start + Process.duck_audio_transition_length) => volume_hi
               )  if silent.start_at
 
+              transition_out_start = silent.end_at + Process.duck_audio_transition_out_start
               ducked_overlay_volume.merge!(
-                [silent.end_at - transition_length/2, 0.0].max => volume_hi,
-                (silent.end_at + transition_length/2) => volume_lo
+                [transition_out_start, 0.0].max => volume_hi,
+                (transition_out_start + Process.duck_audio_transition_length) => volume_lo
               )  if silent.end_at
             end
             overlay in_over.volume ducked_overlay_volume

data/lib/ffmprb/version.rb

@@ -1,3 +1,3 @@
 module Ffmprb
-  VERSION = '0.7.4'
+  VERSION = '0.7.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffmprb
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - showbox.com
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mkfifo