audio_stream 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0dd181cb0224f6603451bf72f635deaa9d406ba76f8e587de6b512f1483a1c0
-  data.tar.gz: b38c9e486e71646a7db650e1c8731d1cb4d8078f7e788bda1897c3ca89334d2d
+  metadata.gz: e1bdc59349cd6ef2c49c5cbc140c15037225f32f852a32ca6e951041b7a30711
+  data.tar.gz: 31694954a02b8920b3da085cba2ac5dfa46c851e44d44f5cf0cefa871b76e1ce
 SHA512:
-  metadata.gz: 8d5a04e5334b1786b16578cdca72bb0f9b296453d7293f61700ebb6447c102d7cbe0509b41505edeaff0bdbcd00382bf2a10e7dcb92bd4033e6df76b48d89e27
-  data.tar.gz: f013bc564ea68724eae776ba5c37244d0167617bbd42032cfa0399e3a03e0e6a6c089d41aaf6de42e8d440204cb5bf5b340b6ddba3b4ae0428ea4181371f7d86
+  metadata.gz: f88c300ac5d2e45e2c7b8b9d4de0aba54a49b22542478c7ba0ae7408140df727cc6ffb66b68f8d6a1353cea462a678ec2bcd6ed4681684ec2c87cfa71d2404a5
+  data.tar.gz: b5281f647673f887c4e001e72c29e678614a064be79fc199156774dfeba2a9c9a51da49f4a58fdbd14a05fa339ced998186b54146f1a7d7c26f134c676d2a9a5

data/audio_stream.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 
-  spec.add_dependency "vdsp", ">= 1.10.0"
+  spec.add_dependency "vdsp", ">= 1.13.0"
   spec.add_dependency "ruby-audio", ">= 1.6.1"
   spec.add_dependency "coreaudio", ">= 0.0.12"
   spec.add_dependency "ruby-fftw3", ">= 1.0.2"

data/lib/audio_stream.rb

@@ -17,6 +17,7 @@ require 'audio_stream/audio_observer'
 require 'audio_stream/audio_observer_lambda'
 require 'audio_stream/audio_observable'
 require 'audio_stream/audio_observable_fx'
+require 'audio_stream/audio_observable_fx_bus'
 require 'audio_stream/audio_observable_lambda'
 require 'audio_stream/audio_notification'
 require 'audio_stream/audio_input'

data/lib/audio_stream/audio_observable.rb

@@ -15,10 +15,19 @@ module AudioStream
       notify_observers(AudioNotification.new(AudioNotification::STAT_COMPLETE, nil, self))
     end
 
-    def fx(effector)
-      observer = AudioObservableFx.new(effector)
-      add_observer(observer)
-      observer
+    def fx(effector, **kwargs)
+      if Fx::MultiAudioInputtable===effector
+        bus = AudioObservableFxBus.new(effector)
+        bus.connect_observable(:main, self)
+        kwargs.each {|key, observable|
+          bus.connect_observable(key, observable)
+        }
+        bus
+      else
+        observer = AudioObservableFx.new(effector)
+        add_observer(observer)
+        observer
+      end
     end
 
     def stereo

data/lib/audio_stream/audio_observable_fx_bus.rb

@@ -0,0 +1,76 @@
+module AudioStream
+  class AudioObservableFxBus
+    include AudioObserver
+    include AudioObservable
+
+    def initialize(effector)
+      @effector = effector
+      @mutex = Mutex.new
+      @observable_keys = {}
+      @notifications = {}
+    end
+
+    def connect_observable(key, observable)
+      @mutex.synchronize {
+        if !@effector.audio_input_keys.include?(key)
+          raise Error.new("audio input key is not registed: %s => %s", @effector.class.name, key)
+        end
+
+        # delete
+        @observable_keys.select {|obs, key1|
+          key1==key
+        }.each {|obs, key1|
+          obs.delete_observer(self)
+          @observable_keys.delete(obs)
+        }
+
+        # add
+        @observable_keys[observable] = key
+        observable.add_observer(self)
+      }
+    end
+
+    def update(notification)
+      do_notify = false
+      is_completed = false
+      next_inputs = nil
+
+      @mutex.synchronize {
+        @notifications[notification.caller_obj] = notification
+
+        if @notifications.length==@observable_keys.length
+          next_inputs = {}
+          @notifications.each {|caller_obj, notification|
+            key = @observable_keys[notification.caller_obj]
+            case notification.stat
+            when AudioNotification::STAT_NEXT
+              next_inputs[key] = notification.input
+            when AudioNotification::STAT_COMPLETE
+              is_completed = true
+            end
+          }
+
+          do_notify = true
+          @notifications.clear
+        end
+      }
+
+      if do_notify
+        if !is_completed
+          on_next(next_inputs)
+        else
+          on_complete
+        end
+      end
+    end
+
+    def on_next(inputs)
+      output = @effector.process(inputs)
+      notify_next(output)
+    end
+
+    def on_complete
+      notify_complete
+    end
+  end
+end

data/lib/audio_stream/fx.rb

@@ -1,4 +1,5 @@
 require 'audio_stream/fx/bang_process'
+require 'audio_stream/fx/multi_audio_inputtable'
 
 require 'audio_stream/fx/a_gain'
 require 'audio_stream/fx/panning'
@@ -20,6 +21,7 @@ require 'audio_stream/fx/tremolo'
 require 'audio_stream/fx/delay'
 require 'audio_stream/fx/chorus'
 require 'audio_stream/fx/phaser'
+require 'audio_stream/fx/vocoder'
 require 'audio_stream/fx/convolution_reverb'
 require 'audio_stream/fx/comb_filter'
 require 'audio_stream/fx/schroeder_reverb'

data/lib/audio_stream/fx/multi_audio_inputtable.rb

@@ -0,0 +1,14 @@
+module AudioStream
+  module Fx
+
+    module MultiAudioInputtable
+      def audio_input_keys
+        @audio_input_keys ||= Set.new
+      end
+
+      def regist_audio_input(key)
+        audio_input_keys << key
+      end
+    end
+  end
+end

data/lib/audio_stream/fx/vocoder.rb

@@ -0,0 +1,53 @@
+module AudioStream
+  module Fx
+    class Vocoder
+      include MultiAudioInputtable
+
+      def initialize(soundinfo, shift: 0, bandwidth: 0.2)
+        regist_audio_input(:main)
+        regist_audio_input(:side)
+
+        band_num = 16
+        nyquist = soundinfo.samplerate * 0.5
+
+        @modulator_bpfs = band_num.times.map {|i|
+          [i, 6.875 * (2 ** (i*0.5 + 3 - (shift/12.0)))]
+        }.select {|i, freq|
+          0<freq && freq<nyquist
+        }.map {|i, freq|
+          [i, BandPassFilter.create(soundinfo, freq: freq, bandwidth: bandwidth)]
+        }.to_h
+
+        @carrier_bpfs = band_num.times.map {|i|
+          [i, 6.875 * (2 ** (i*0.5 + 3))]
+        }.select {|i, freq|
+          0<freq && freq<nyquist
+        }.map {|i, freq|
+          [i, BandPassFilter.create(soundinfo, freq: freq, bandwidth: bandwidth)]
+        }.to_h
+
+        @band_keys = @modulator_bpfs.keys & @carrier_bpfs.keys
+      end
+
+      def process(inputs)
+        carrier = inputs[:main]
+        modulator = inputs[:side]
+
+        channels = [carrier.channels, modulator.channels].max
+        if channels==2
+          carrier = carrier.stereo
+          modulator = modulator.stereo
+        end
+
+        dsts = channels.times.map {|i|
+          @band_keys.map {|key|
+            level = @modulator_bpfs[key].process(modulator).streams[i].max
+            @carrier_bpfs[key].process(carrier).streams[i] * level
+          }.inject(:+)
+        }
+
+        Buffer.new(*dsts)
+      end
+    end
+  end
+end

data/lib/audio_stream/version.rb

@@ -1,3 +1,3 @@
 module AudioStream
-  VERSION = "3.1.0"
+  VERSION = "3.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: audio_stream
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-24 00:00:00.000000000 Z
+date: 2019-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: ruby-audio
   requirement: !ruby/object:Gem::Requirement
@@ -156,6 +156,7 @@ files:
 - lib/audio_stream/audio_notification.rb
 - lib/audio_stream/audio_observable.rb
 - lib/audio_stream/audio_observable_fx.rb
+- lib/audio_stream/audio_observable_fx_bus.rb
 - lib/audio_stream/audio_observable_lambda.rb
 - lib/audio_stream/audio_observer.rb
 - lib/audio_stream/audio_observer_lambda.rb
@@ -186,6 +187,7 @@ files:
 - lib/audio_stream/fx/high_shelf_filter.rb
 - lib/audio_stream/fx/low_pass_filter.rb
 - lib/audio_stream/fx/low_shelf_filter.rb
+- lib/audio_stream/fx/multi_audio_inputtable.rb
 - lib/audio_stream/fx/noise_gate.rb
 - lib/audio_stream/fx/panning.rb
 - lib/audio_stream/fx/peaking_filter.rb
@@ -193,6 +195,7 @@ files:
 - lib/audio_stream/fx/schroeder_reverb.rb
 - lib/audio_stream/fx/tremolo.rb
 - lib/audio_stream/fx/tuner.rb
+- lib/audio_stream/fx/vocoder.rb
 - lib/audio_stream/ring_buffer.rb
 - lib/audio_stream/sound_info.rb
 - lib/audio_stream/sync.rb
@@ -219,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: AudioStream is a Digital Audio Workstation for CLI