ffmprb 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 161070550653011018121ce41eed46e7c762bfb5
-  data.tar.gz: 75ab98311631bdcf5492d6ec9cb186d81139737f
+  metadata.gz: 18d2b33a88ea0bfef44157b50426e7a5fbd587e2
+  data.tar.gz: 38db083fd7d0b4c33f23516c10efaff35cc922ad
 SHA512:
-  metadata.gz: 6a0cf9ba9bf75eebad6401578df7161acf208f3b1a926caa8b6007f29723be21690b5fbb6a5b53f5d046d26b1978358bfe08f15f72c1a9ed39a8327dff31ad1a
-  data.tar.gz: 0339770c72cddda4ff50cfd98b56366573f90d110fa6c30e421d16d6bcabbf5a6d11014fbaeaca468594160bbc00da0495d984033491b26fd044ac77f00e421a
+  metadata.gz: 02a1c4faeaddf87e9e24ff957c812adae99d10988224445904b37435a96a184177e00ec70042227e6c68316b80a999a1c4672671036179eb42bcc2a005299c8e
+  data.tar.gz: 57f3a51c4604a7d9136ce25283d9794a6aa95ad893452ed3b0550184df1002e9ceed23e9b043b216bbe16e0bc1d6b62b2b9f99a3415da90fe924c1e665559bf6

data/lib/defaults.rb

@@ -8,7 +8,7 @@ module Ffmprb
   Process.duck_audio_transition_out_start = -0.6
   Process.duck_audio_volume_hi = 0.9
   Process.duck_audio_volume_lo = 0.1
-  Process.timeout = 15
+  Process.timeout = 30
 
   Process.output_video_resolution = CGA
   Process.output_video_fps = 30
@@ -16,12 +16,12 @@ module Ffmprb
 
   Util.ffmpeg_cmd = %w[ffmpeg -y]
   Util.ffprobe_cmd = ['ffprobe']
-  Util.cmd_timeout = 6
+  Util.cmd_timeout = 30
 
   Util::ThreadedIoBuffer.blocks_max = 1024
   Util::ThreadedIoBuffer.block_size = 64*1024
   Util::ThreadedIoBuffer.timeout = 9
 
-  Util::Thread.timeout = 12
+  Util::Thread.timeout = 15
 
 end

data/lib/ffmprb/file.rb

@@ -66,7 +66,7 @@ module Ffmprb
         return fifo_file  unless block_given?
 
         begin
-          yield
+          yield fifo_file
         ensure
           fifo_file.remove
         end

data/lib/ffmprb/process/output.rb

@@ -17,10 +17,11 @@ module Ffmprb
 
       end
 
-      # TODO unique labeling does not justify idx, will be refactored
-      def initialize(io, idx, video:, audio:)
+      attr_reader :process
+
+      def initialize(io, process, video:, audio:)
         @io = resolve(io)
-        @idx = idx
+        @process = process
         @channels = {
           video: video && @io.channel?(:video) && OpenStruct.new(video),
           audio: audio && @io.channel?(:audio) && OpenStruct.new(audio)
@@ -39,6 +40,8 @@ module Ffmprb
         fail Error, "Supporting just full_screen for now, sorry."  unless @reels.all?(&:full_screen?)
         return @filters  if @filters
 
+        idx = process.output_index(self)
+
         @filters = []
 
         # Concatting
@@ -52,7 +55,7 @@ module Ffmprb
 
             # NOTE mapping input to this lbl
 
-            lbl = "o#{@idx}rl#{i}"
+            lbl = "o#{idx}rl#{i}"
 
             # NOTE Image-Padding to match the target resolution
             # TODO full screen only at the moment (see exception above)
@@ -130,11 +133,11 @@ module Ffmprb
 
               # NOTE snip the end of the previous segment and combine with this reel
 
-              lbl_end1 = "o#{@idx}tm#{i}b"
-              lbl_reel = "o#{@idx}tn#{i}"
+              lbl_end1 = "o#{idx}tm#{i}b"
+              lbl_reel = "o#{idx}tn#{i}"
 
               if !lbl  # no reel
-                lbl_aux = "o#{@idx}bk#{i}"
+                lbl_aux = "o#{idx}bk#{i}"
                 @filters.concat(
                   Filter.blank_source transition_length, channel(:video).resolution, channel(:video).fps, "#{lbl_aux}:v"
                 )  if channel?(:video)
@@ -168,7 +171,7 @@ module Ffmprb
 
         segments.compact!
 
-        lbl_out = "o#{@idx}o"
+        lbl_out = "o#{idx}o"
 
         @filters.concat(
           Filter.concat_v segments.map{|s| "#{s}:v"}, "#{lbl_out}:v"
@@ -188,9 +191,9 @@ module Ffmprb
 
           # Audio overlaying
 
-          lbl_nxt = "o#{@idx}o#{i}"
+          lbl_nxt = "o#{idx}o#{i}"
 
-          lbl_over = "o#{@idx}l#{i}"
+          lbl_over = "o#{idx}l#{i}"
           @filters.concat(  # NOTE audio only, see above
             over_reel.reel.filters_for lbl_over, video: false, audio: channel(:audio)
           )
@@ -235,7 +238,7 @@ module Ffmprb
             Ffmprb.logger.debug "Re-routed the main audio output (#{main_av_inter_o.path}->...->#{main_av_o.path}) through the process of audio ducking"
 
             over_a_i, over_a_o = File.threaded_buffered_fifo(Process.intermediate_channel_extname :audio)
-            lbl_over = "o#{@idx}l#{i}"
+            lbl_over = "o#{idx}l#{i}"
             @filters.concat(
               over_reel.reel.filters_for lbl_over, video: false, audio: channel(:audio)
             )
@@ -245,12 +248,17 @@ module Ffmprb
             inter_i, inter_o = File.threaded_buffered_fifo(main_av_inter_o.extname)
             Ffmprb.logger.debug "Allocated fifos to buffer media (#{inter_i.path}>#{inter_o.path}) while finding silence"
 
+            ignore_broken_pipe_was = process.ignore_broken_pipe
+            process.ignore_broken_pipe = true  # NOTE audio ducking process may break the overlay pipe
+
             Util::Thread.new "audio ducking" do
               silence = Ffmprb.find_silence(main_av_inter_o, inter_i)
 
               Ffmprb.logger.debug "Audio ducking with silence: [#{silence.map{|s| "#{s.start_at}-#{s.end_at}"}.join ', '}]"
 
-              Process.duck_audio inter_o, over_a_o, silence, main_av_o, video: channel(:video), audio: channel(:audio)
+              Process.duck_audio inter_o, over_a_o, silence, main_av_o,
+                process_options: {ignore_broken_pipe: ignore_broken_pipe_was, timeout: process.timeout},
+                video: channel(:video), audio: channel(:audio)
             end
           end
 

data/lib/ffmprb/process.rb

@@ -44,10 +44,11 @@ module Ffmprb
         volume_lo: duck_audio_volume_lo,
         volume_hi: duck_audio_volume_hi,
         silent_min: duck_audio_silent_min,
+        process_options: {},
         video:,  # NOTE Temporarily, video should not be here
         audio:
         )
-        Ffmprb.process do
+        Ffmprb.process **process_options do
 
           in_main = input(av_main_i)
           in_over = input(a_overlay_i)
@@ -80,13 +81,14 @@ module Ffmprb
 
     end
 
-    attr_reader :timeout
+    attr_accessor :timeout
+    attr_accessor :ignore_broken_pipe
 
     def initialize(*args, **opts)
       @inputs, @outputs = [], []
-      @timeout = opts.delete(:timeout) || self.class.timeout
+      self.timeout = opts.delete(:timeout) || self.class.timeout
 
-      @ignore_broken_pipe = opts.delete(:ignore_broken_pipe)  # XXX SPEC ME
+      self.ignore_broken_pipe = opts.delete(:ignore_broken_pipe)
       fail Error, "Unknown options: #{opts}"  unless opts.empty?
     end
 
@@ -107,7 +109,7 @@ module Ffmprb
     end
 
     def output(io, video: true, audio: true, &blk)
-      Output.new(io, @outputs.size,
+      Output.new(io, self,
         video: channel_params(video, self.class.output_video_options),
         audio: channel_params(audio, self.class.output_audio_options)
       ).tap do |out|
@@ -116,6 +118,10 @@ module Ffmprb
       end
     end
 
+    def output_index(output)
+      @outputs.index output
+    end
+
     # NOTE the one and the only entry-point processing function which spawns threads etc
     def run(limit: nil)  # TODO (async: false)
       # NOTE this is both for the future async: option and according to

data/lib/ffmprb/version.rb

@@ -1,3 +1,3 @@
 module Ffmprb
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/lib/ffmprb.rb

@@ -16,10 +16,10 @@ module Ffmprb
   class << self
 
     # TODO limit:
-    def process(*args, &blk)
+    def process(*args, **opts, &blk)
       fail Error, "process: nothing ;( gimme a block!"  unless blk
 
-      process = Process.new
+      process = Process.new(**opts)
 
       logger.debug "Starting process with #{args} in #{blk.source_location}"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffmprb
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - showbox.com