audio_stream 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcfa4c84415b2d3fce58e09f86e7f7ed93fc6bf57e302580b8b629fea6b98ed9
-  data.tar.gz: 5e29c910eddfed09ffe952b6e3ab5cfd75f79dfe1072681bfb10ca3a720195d5
+  metadata.gz: e0dd181cb0224f6603451bf72f635deaa9d406ba76f8e587de6b512f1483a1c0
+  data.tar.gz: b38c9e486e71646a7db650e1c8731d1cb4d8078f7e788bda1897c3ca89334d2d
 SHA512:
-  metadata.gz: 3a812266f92786ab35b68ad6b731020525afda6a0d3dfccda2e47ac466696ec30cdaf82475d0bf0fbda15d7527d9f001ea1d98ef0e6ce8d23769a01f966008c9
-  data.tar.gz: be4a1e89411f6d0d881119750508d50d7099fe2d8c046fb24f6323520ab065d4469b67a9983460f8138b463fc6f5023a67376cb7a38860fcc849b59e9249353d
+  metadata.gz: 8d5a04e5334b1786b16578cdca72bb0f9b296453d7293f61700ebb6447c102d7cbe0509b41505edeaff0bdbcd00382bf2a10e7dcb92bd4033e6df76b48d89e27
+  data.tar.gz: f013bc564ea68724eae776ba5c37244d0167617bbd42032cfa0399e3a03e0e6a6c089d41aaf6de42e8d440204cb5bf5b340b6ddba3b4ae0428ea4181371f7d86

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.6.0"
+  spec.add_dependency "vdsp", ">= 1.10.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/audio_output_file.rb

@@ -17,6 +17,12 @@ module AudioStream
     end
 
     def on_next(input)
+      case @soundinfo.channels
+      when 1
+        input = input.mono
+      when 2
+        input = input.stereo
+      end
       @sound.write(input.to_rabuffer)
     end
 

data/lib/audio_stream/buffer.rb

@@ -100,7 +100,8 @@ module AudioStream
       dst = buffers.inject(:+)
 
       if average
-        dst /= buffers.length.to_f
+        gain = AGain.new(level: 1.0/buffers.length)
+        dst = gain.process(dst)
       end
 
       dst
@@ -174,7 +175,7 @@ module AudioStream
 
       case channels
       when 1
-        @stream0.each {|v|
+        @stream0.each_with_index {|v, i|
           rabuf[i] = v
         }
       when 2

data/lib/audio_stream/fx.rb

@@ -12,13 +12,17 @@ require 'audio_stream/fx/band_pass_filter'
 require 'audio_stream/fx/low_shelf_filter'
 require 'audio_stream/fx/high_shelf_filter'
 require 'audio_stream/fx/peaking_filter'
+require 'audio_stream/fx/all_pass_filter'
 require 'audio_stream/fx/equalizer_2band'
 require 'audio_stream/fx/equalizer_3band'
 require 'audio_stream/fx/graphic_equalizer'
 require 'audio_stream/fx/tremolo'
 require 'audio_stream/fx/delay'
 require 'audio_stream/fx/chorus'
+require 'audio_stream/fx/phaser'
 require 'audio_stream/fx/convolution_reverb'
+require 'audio_stream/fx/comb_filter'
+require 'audio_stream/fx/schroeder_reverb'
 require 'audio_stream/fx/hanning_window'
 
 require 'audio_stream/fx/tuner'

data/lib/audio_stream/fx/all_pass_filter.rb

@@ -0,0 +1,30 @@
+module AudioStream
+  module Fx
+    class AllPassFilter < BiquadFilter
+
+      def update_coef(freq:, q:)
+        omega = 2.0 * Math::PI * freq / @samplerate
+        alpha = Math.sin(omega) / (2.0 * q)
+
+        a0 = 1.0 + alpha
+        a1 = -2.0 * Math.cos(omega)
+        a2 = 1.0 - alpha
+        b0 = 1.0 - alpha
+        b1 = -2.0 * Math.cos(omega)
+        b2 = 1.0 + alpha
+
+        @coef = Vdsp::Biquad::Coefficient.new(b0/a0, b1/a0, b2/a0, a1/a0, a2/a0)
+        @biquads.each {|biquad|
+          biquad.coefficients = @coef
+        }
+      end
+
+      def self.create(soundinfo, freq:, q: DEFAULT_Q)
+        filter = new(soundinfo)
+        filter.update_coef(freq: freq, q: q)
+
+        filter
+      end
+    end
+  end
+end

data/lib/audio_stream/fx/comb_filter.rb

@@ -0,0 +1,40 @@
+module AudioStream
+  module Fx
+    class CombFilter
+
+      def initialize(soundinfo, freq:, q:)
+        @window_size = soundinfo.window_size
+        @samplerate = soundinfo.samplerate
+        @delaysample = (soundinfo.samplerate.to_f / freq).round
+        @q = q
+
+        @delaybufs = [
+          Vdsp::DoubleArray.new(soundinfo.window_size + @delaysample),
+          Vdsp::DoubleArray.new(soundinfo.window_size + @delaysample),
+        ]
+      end
+
+      def process(input)
+        window_size = input.window_size
+        if @window_size!=window_size
+          raise "window size is not match: impulse.size=#{@window_size} input.size=#{window_size}"
+        end
+
+        streams = input.streams.map.with_index {|src, i|
+          buf = @delaybufs[i]
+
+          Vdsp::UnsafeDouble.copy(buf, window_size, 1, buf, 0, 1, @delaysample)
+          if @delaysample<window_size
+            Vdsp::UnsafeDouble.vclr(buf, window_size, 1, @delaysample)
+          end
+          Vdsp::UnsafeDouble.vsmsma(src, 0, 1, 1.0, buf, 0, 1, @q, buf, @delaysample, 1, window_size)
+          dst = buf[@delaysample, window_size]
+
+          dst
+        }
+
+        Buffer.new(*streams)
+      end
+    end
+  end
+end

data/lib/audio_stream/fx/compressor.rb

@@ -9,14 +9,19 @@ module AudioStream
 
       def process(input)
         streams = input.streams.map {|stream|
-          stream.map {|f|
-            sign = f.negative? ? -1 : 1
-            f = f.abs
-            if @threshold<f
-              f = (f - @threshold) * @ratio + @threshold
-            end
-            @zoom * f * sign
-          }
+          sign = Vdsp::DoubleArray.new(input.window_size)
+          Vdsp::UnsafeDouble.vlim(stream, 0, 1, 0.0, @zoom, sign, 0, 1, input.window_size)
+
+          abs = stream.abs
+
+          under = Vdsp::DoubleArray.new(input.window_size)
+          Vdsp::UnsafeDouble.vclip(abs, 0, 1, 0.0, @threshold, under, 0, 1, input.window_size)
+
+          over = Vdsp::DoubleArray.new(input.window_size)
+          Vdsp::UnsafeDouble.vthr(abs, 0, 1, @threshold, over, 0, 1, input.window_size)
+          over = (over - @threshold) * @ratio
+
+          (under + over) * sign
         }
         Buffer.new(*streams)
       end

data/lib/audio_stream/fx/distortion.rb

@@ -8,15 +8,9 @@ module AudioStream
 
       def process(input)
         streams = input.streams.map {|stream|
-          stream.map {|f|
-            val = f * @gain
-            if 1.0 < val
-              val = 1.0
-            elsif val < -1.0
-              val = -1.0
-            end
-            val * @level
-          }
+          dst = Vdsp::DoubleArray.new(input.window_size)
+          Vdsp::UnsafeDouble.vclip(stream * @gain, 0, 1, -1.0, 1.0, dst, 0, 1, input.window_size)
+          dst * @level
         }
         Buffer.new(*streams)
       end

data/lib/audio_stream/fx/hanning_window.rb

@@ -4,20 +4,26 @@ module AudioStream
       include Singleton
 
       def process(input)
-        window_size = input.window_size
-        window_max = input.window_size - 1
-        channels = input.channels
+        #window_size = input.window_size
+        #window_max = input.window_size - 1
+        #channels = input.channels
 
-        period = 2 * Math::PI / window_max
+        #period = 2 * Math::PI / window_max
 
         streams = input.streams.map {|stream|
-          stream.map.with_index {|f, i|
-            f * (0.5 - 0.5 * Math.cos(i * period))
-          }
+          #stream.map.with_index {|f, i|
+          #  f * (0.5 - 0.5 * Math.cos(i * period))
+          #}
+          stream * self.window(input.window_size)
         }
 
         Buffer.new(*streams)
       end
+
+      def window(size)
+        @window ||= {}
+        @window[size] ||= Vdsp::DoubleArray.hann_window(size, Vdsp::FULL_WINDOW)
+      end
     end
   end
 end

data/lib/audio_stream/fx/phaser.rb

@@ -0,0 +1,45 @@
+module AudioStream
+  module Fx
+    class Phaser
+
+      def initialize(soundinfo, rate:, depth:, freq:, dry: 0.5, wet: 0.5)
+        @soundinfo = soundinfo
+
+        @filters = [
+          AllPassFilter.new(soundinfo),
+          AllPassFilter.new(soundinfo),
+        ]
+
+        @speed = 2.0 * Math::PI * rate / @soundinfo.samplerate
+        @phase = 0
+
+        @depth = depth
+        @freq = freq
+
+        @dry = dry
+        @wet = wet
+      end
+
+      def process(input)
+        window_size = input.window_size
+        @phase = (@phase + @speed * window_size) % (window_size / @speed)
+
+        a = Math.sin(@phase) * 0.5 + 0.5
+        apf_freq = @freq * (1.0 + a * @depth)
+
+        wet = input
+        @filters.each {|filter|
+          filter.update_coef(freq: apf_freq, q: BiquadFilter::DEFAULT_Q)
+          wet = filter.process(wet)
+        }
+
+        streams = wet.streams.map.with_index {|wet_stream, i|
+          dry_stream = input.streams[i]
+          dry_stream * @dry + wet_stream * @wet
+        }
+
+        Buffer.new(*streams)
+      end
+    end
+  end
+end

data/lib/audio_stream/fx/schroeder_reverb.rb

@@ -0,0 +1,52 @@
+module AudioStream
+  module Fx
+    class SchroederReverb
+
+      def initialize(soundinfo, time:, dry: 1.0, wet: 0.7)
+        @window_size = soundinfo.window_size
+        @combs = [
+          CombFilter.new(soundinfo, freq: ms2freq(39.85 / 2.0 * time), q: 0.871402),
+          CombFilter.new(soundinfo, freq: ms2freq(36.10 / 2.0 * time), q: 0.882762),
+          CombFilter.new(soundinfo, freq: ms2freq(33.27 / 2.0 * time), q: 0.891443),
+          CombFilter.new(soundinfo, freq: ms2freq(30.15 / 2.0 * time), q: 0.901117),
+        ]
+        @allpasss = [
+          AllPassFilter.create(soundinfo, freq: ms2freq(5.0), q: 0.7),
+          AllPassFilter.create(soundinfo, freq: ms2freq(1.7), q: 0.7),
+        ]
+
+        @dry = dry.to_f
+        @wet = wet.to_f
+      end
+
+      def process(input)
+        window_size = input.window_size
+        if @window_size!=window_size
+          raise "window size is not match: impulse.size=#{@window_size} input.size=#{window_size}"
+        end
+
+        wets = @combs.map {|comb|
+          comb.process(input)
+        }
+        wet = Buffer.merge(wets, average: true)
+
+        @allpasss.each {|allpass|
+          wet = allpass.process(wet)
+        }
+
+        streams = wet.streams.map.with_index {|wet_stream, i|
+          dry_stream = input.streams[i]
+          dst = Vdsp::DoubleArray.new(window_size)
+          Vdsp::UnsafeDouble.vsmsma(dry_stream, 0, 1, @dry, wet_stream, 0, 1, @wet, dst, 0, 1, window_size)
+          dst
+        }
+
+        Buffer.new(*streams)
+      end
+
+      def ms2freq(ms)
+        1.0 / (ms / 1000.0)
+      end
+    end
+  end
+end

data/lib/audio_stream/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: audio_stream
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-04 00:00:00.000000000 Z
+date: 2019-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: ruby-audio
   requirement: !ruby/object:Gem::Requirement
@@ -168,10 +168,12 @@ files:
 - lib/audio_stream/error.rb
 - lib/audio_stream/fx.rb
 - lib/audio_stream/fx/a_gain.rb
+- lib/audio_stream/fx/all_pass_filter.rb
 - lib/audio_stream/fx/band_pass_filter.rb
 - lib/audio_stream/fx/bang_process.rb
 - lib/audio_stream/fx/biquad_filter.rb
 - lib/audio_stream/fx/chorus.rb
+- lib/audio_stream/fx/comb_filter.rb
 - lib/audio_stream/fx/compressor.rb
 - lib/audio_stream/fx/convolution_reverb.rb
 - lib/audio_stream/fx/delay.rb
@@ -187,6 +189,8 @@ files:
 - lib/audio_stream/fx/noise_gate.rb
 - lib/audio_stream/fx/panning.rb
 - lib/audio_stream/fx/peaking_filter.rb
+- lib/audio_stream/fx/phaser.rb
+- lib/audio_stream/fx/schroeder_reverb.rb
 - lib/audio_stream/fx/tremolo.rb
 - lib/audio_stream/fx/tuner.rb
 - lib/audio_stream/ring_buffer.rb