ffmprb 0.12.2 → 0.12.3

data/exp/present/exp/present.rb

@@ -8,7 +8,7 @@ VIDEO_OPT = {resolution: Ffmprb::HD_1080p, fps: 30}
 
 
 # XXX
-def dura_to_sec(dura_str)
+def dura_to(dura_str)
   dura_str.split(':').reverse.each_with_index.reduce(0) do |sec, (ns, i)|
     sec + ns.to_i*(60**i)
   end

data/exp/youtubby/exp/gop-raw-cut-you-HD60.rb

@@ -90,6 +90,7 @@ end
 
 channel = ARGV.shift || 'default'
 
+# XXX too complicated? maybe 3 scripts instead?
 abort "USAGE: gop-raw-cut-you-HD60.rb [CHANNEL]"  unless
   ARGV.empty?
 

data/exp/youtubby/google_youtube.rb

@@ -22,9 +22,9 @@ def google_youtube(cb_uri, user_id, &blk)
       Google::Apis::YoutubeV3::AUTH_YOUTUBE,
       Google::Auth::Stores::FileTokenStore.new(file: GOOGLE_CREDENTIAL_STORE)
     )
-    youtube.client_options.send_timeout_sec =
-      youtube.client_options.open_timeout_sec =
-      youtube.client_options.read_timeout_sec = YOUTUBE_TIMEOUT_SEC
+    youtube.client_options.send_timeout =
+      youtube.client_options.open_timeout =
+      youtube.client_options.read_timeout = YOUTUBE_TIMEOUT
     youtube.authorization =
       if (credentials = authorizer.get_credentials(user_id))
         credentials

data/ffmprb.gemspec

@@ -47,6 +47,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.6'  # TODO check 3.X
+
   # NOTE I'm not happy with this dependency, and there's nothing crossplatform (= for windoze too) at the moment
   spec.add_dependency 'mkfifo', '~> 0.1.1'
   # NOTE make it into an optional dependency? Nah for now

data/lib/ffmprb/file/sample.rb

@@ -2,8 +2,11 @@ module Ffmprb
 
   class File
 
+    AUDIO_SAMPLE_MIN = 0.5
+
     def sample(
       at: 0.01,
+      duration: 0,
       video: true,
       audio: true,
       &blk
@@ -11,15 +14,22 @@ module Ffmprb
       audio = File.temp('.wav')  if audio == true
       video = File.temp('.png')  if video == true
 
-      Ffmprb.logger.debug{"Snap shooting files, video path: #{video ? video.path : 'NONE'}, audio path: #{audio ? audio.path : 'NONE'}"}
+      Ffmprb.logger.debug{"Snap shooting files, video: #{video && video.path}, audio: #{audio && audio.path}"}
 
-      fail Error, "Incorrect output extname (must be image)"  unless !video || video.channel?(:video) && !video.channel?(:audio)
-      fail Error, "Incorrect audio extname (must be sound)"  unless !audio || audio.channel?(:audio) && !audio.channel?(:video)
-      fail Error, "Can sample either video OR audio UNLESS a block is given"  unless block_given? || !!audio != !!video
+      fail Error, "Incorrect output extname (must be image)"  unless
+        !video || video.channel?(:video) && !video.channel?(:audio)
+      fail Error, "Incorrect audio extname (must be sound)"  unless
+        !audio || audio.channel?(:audio) && !audio.channel?(:video)
+      fail Error, "Can sample either video OR audio UNLESS a block is given"  unless
+        block_given? || !!audio != !!video
+      fail Error, "Can sample video just for 0 sec (an image snapshot)"  unless
+        !video || duration == 0
 
       cmd = %W[-i #{path}]
       cmd.concat %W[-deinterlace -an -ss #{at} -vframes 1 #{video.path}]  if video
-      cmd.concat %W[-vn -ss #{at} -t 1 #{audio.path}]  if audio
+      audio_duration = [AUDIO_SAMPLE_MIN, duration].max
+      audio_at = [0, at - audio_duration / 2].max
+      cmd.concat %W[-vn -ss #{audio_at} -t #{audio_duration} #{audio.path}]  if audio
       Util.ffmpeg *cmd
 
       return video || audio  unless block_given?
@@ -42,7 +52,5 @@ module Ffmprb
     def sample_audio(*audio, at: 0.01, &blk)
       sample at: at, video: false, audio: (audio.first || true), &blk
     end
-
   end
-
 end

data/lib/ffmprb/filter.rb

@@ -304,10 +304,18 @@ module Ffmprb
       end
 
 
-      def complex_args(*filters)
-        [].tap do |args|
-          args << '-filter_complex' << filters.join('; ') unless
-            filters.empty?
+      def complex_args(*filters, script_file: nil)
+        if filters.empty?
+          []
+        else
+          filter_complex_opt = filters.join('; ')
+          if script_file
+            script_file.write filter_complex_opt
+            script_file.close
+            ['-filter_complex_script', script_file.path]
+          else
+            ['-filter_complex', filter_complex_opt]
+          end
         end
       end
 

data/lib/ffmprb/process/input/chain_base.rb

@@ -25,6 +25,11 @@ module Ffmprb
           # Doing nothing
           unfiltered.filters_for lbl, video: video, audio: audio
         end
+
+
+        def channel(medium)
+          io.channel medium
+        end
       end
     end
   end

data/lib/ffmprb/process/input/cut.rb

@@ -56,11 +56,7 @@ module Ffmprb
               ]
             end
         end
-
       end
-
     end
-
   end
-
 end

data/lib/ffmprb/process/input.rb

@@ -40,8 +40,8 @@ module Ffmprb
       attr_reader :process
 
       def initialize(io, process, video:, audio:)
-        @io = self.class.resolve(io)
         @process = process
+        @io = self.class.resolve(io)
         @channels = {
           video: video && @io.channel?(:video) && OpenStruct.new(video),
           audio: audio && @io.channel?(:audio) && OpenStruct.new(audio)
@@ -76,18 +76,18 @@ module Ffmprb
                 Filter.copy "#{in_lbl}:v", "#{lbl}:v"
               end
             elsif video
-              fail Error, "No video stream to provide"
+              fail Error, "No video stream to provide ('#{io.path}')"
             end),
           *(if audio && channel?(:audio)
               Filter.anull "#{in_lbl}:a", "#{lbl}:a"
             elsif audio
-              fail Error, "No audio stream to provide"
+              fail Error, "No audio stream to provide ('#{io.path}')"
             end)
         ]
       end
 
       def channel?(medium)
-        io.channel? medium
+        !!channel(medium)
       end
 
       def channel(medium)

data/lib/ffmprb/process.rb

@@ -1,3 +1,5 @@
+require 'tempfile'
+
 module Ffmprb
 
   class Process
@@ -161,11 +163,12 @@ module Ffmprb
       thr = Util::Thread.new main: !parent do
         proc_vis_node Thread.current
         # NOTE yes, an exception can occur anytime, and we'll just die, it's ok, see above
-        cmd = command
-        opts = {limit: limit, timeout: timeout}
-        opts[:ignore_broken_pipes] = ignore_broken_pipes  unless ignore_broken_pipes.nil?
-        Util.ffmpeg(*cmd, **opts).tap do |res|
-          Util::Thread.join_children! limit, timeout: timeout
+        command do |cmd|
+          opts = {limit: limit, timeout: timeout}
+          opts[:ignore_broken_pipes] = ignore_broken_pipes  unless ignore_broken_pipes.nil?
+          Util.ffmpeg(*cmd, **opts).tap do |res|
+            Util::Thread.join_children! limit, timeout: timeout
+          end
         end
         proc_vis_node Thread.current, :remove
       end
@@ -175,23 +178,28 @@ module Ffmprb
     private
 
     def command
-      input_args + filter_args + output_args
+      fail "Miserably"  unless
+        block_given?
+      Tempfile.create do |tmp_file|
+        yield input_args(tmp_file) + filter_args(tmp_file) + output_args(tmp_file)
+      end
     end
 
-    def input_args
-      filter_args  # NOTE must run first
+    def input_args(script_file=nil)
+      filter_args script_file  # NOTE must run first
       @input_args ||= @inputs.map(&:args).reduce(:+)
     end
 
-    # NOTE must run first
-    def filter_args
+    # NOTE must run first (which is excusable just because it's private)
+    def filter_args(script_file=nil)
       @filter_args ||= Filter.complex_args(
-        @outputs.map(&:filters).reduce :+
+        *@outputs.map(&:filters).reduce(:+),
+        script_file: script_file
       )
     end
 
-    def output_args
-      filter_args  # NOTE must run first
+    def output_args(script_file=nil)
+      filter_args script_file  # NOTE must run first
       @output_args ||= @outputs.map(&:args).reduce(:+)
     end
 

data/lib/ffmprb/util.rb

@@ -24,12 +24,14 @@ module Ffmprb
       def ffmpeg(*args, limit: nil, timeout: cmd_timeout, ignore_broken_pipes: true)
         args = %w[-loglevel debug] + args  if
           Ffmprb.ffmpeg_debug
-        sh *ffmpeg_cmd, *args,
-        output: :stderr,
-        limit: limit,
-        timeout: timeout,
-        ignore_broken_pipes: ignore_broken_pipes,
-        broken_pipe_error_re: FFMPEG_BROKEN_PIPE_ERROR_RE
+        sh(
+          *ffmpeg_cmd, *args,
+          output: :stderr,
+          limit: limit,
+          timeout: timeout,
+          ignore_broken_pipes: ignore_broken_pipes,
+          broken_pipe_error_re: FFMPEG_BROKEN_PIPE_ERROR_RE
+        )
       end
 
       def sh(*cmd, input: nil, output: :stdout, limit: nil, timeout: cmd_timeout, ignore_broken_pipes: false, broken_pipe_error_re: nil)

data/lib/ffmprb/version.rb

@@ -1,6 +1,6 @@
 module Ffmprb
 
-  VERSION = '0.12.2'
+  VERSION = '0.12.3'
 
   GEM_GITHUB_URL = 'https://github.com/costa/ffmprb'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffmprb
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
 platform: ruby
 authors:
 - Costa Shapiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-20 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mkfifo
@@ -235,7 +235,6 @@ files:
 - tmp/exp/src/SAM_3132.MP4
 - tmp/ffmprb-0.11.4.gem
 - tmp/output.rb
-- tmp/rspec_guard_result
 homepage: https://github.com/costa/ffmprb
 licenses: []
 metadata: {}
@@ -248,7 +247,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/tmp/rspec_guard_result

@@ -1,2 +0,0 @@
-14 examples, 1 failures in 36.6918 seconds
-./spec/ffmprb_spec.rb:485