audio_stream 3.3.0 → 3.4.0

data/lib/audio_stream/fx/schroeder_reverb.rb

@@ -2,21 +2,24 @@ module AudioStream
   module Fx
     class SchroederReverb
 
-      def initialize(soundinfo, time:, dry: 1.0, wet: 0.7)
+      # @param soundinfo [AudioStream::SoundInfo]
+      # @param dry [AudioStream::Decibel | Float] dry gain
+      # @param wet [AudioStream::Decibel | Float] wet gain
+      def initialize(soundinfo, dry: -1.0, wet: -20.0)
         @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),
+          CombFilter.new(soundinfo, freq: Rate.msec(39.85), q: 0.871402),
+          CombFilter.new(soundinfo, freq: Rate.msec(36.10), q: 0.882762),
+          CombFilter.new(soundinfo, freq: Rate.msec(33.27), q: 0.891443),
+          CombFilter.new(soundinfo, freq: Rate.msec(30.15), q: 0.901117),
         ]
         @allpasss = [
-          AllPassFilter.create(soundinfo, freq: ms2freq(5.0), q: 0.7),
-          AllPassFilter.create(soundinfo, freq: ms2freq(1.7), q: 0.7),
+          AllPassFilter.create(soundinfo, freq: Rate.msec(5.0).freq(soundinfo), q: BiquadFilter::DEFAULT_Q),
+          AllPassFilter.create(soundinfo, freq: Rate.msec(1.7).freq(soundinfo), q: BiquadFilter::DEFAULT_Q),
         ]
 
-        @dry = dry.to_f
-        @wet = wet.to_f
+        @dry = Decibel.db(dry).mag
+        @wet = Decibel.db(wet).mag
       end
 
       def process(input)
@@ -43,10 +46,6 @@ module AudioStream
 
         Buffer.new(*streams)
       end
-
-      def ms2freq(ms)
-        1.0 / (ms / 1000.0)
-      end
     end
   end
 end

data/lib/audio_stream/fx/tremolo.rb

@@ -1,23 +1,25 @@
 module AudioStream
   module Fx
     class Tremolo
+      # @param soundinfo [AudioStream::SoundInfo]
+      # @param freq [AudioStream::Rate | Float] Tremolo speed (0.0~)
+      # @param depth [Float] Tremolo depth (0.0~)
       def initialize(soundinfo, freq:, depth:)
-        @samplerate = soundinfo.samplerate
-        @freq = freq.to_f
+        @freq = Rate.freq(freq)
         @depth = depth.to_f
         @phase = 0
+        @period = @freq.sample_phase(soundinfo)
       end
 
       def process(input)
         window_size = input.window_size
-        period = 2 * Math::PI * @freq / @samplerate
 
         streams = input.streams.map {|stream|
           stream.map.with_index {|f, i|
-            f * (1.0 + @depth * Math.sin((i + @phase) * period))
+            f * (1.0 + @depth * Math.sin((i + @phase) * @period))
           }
         }
-        @phase = (@phase + window_size) % (window_size / period)
+        @phase = (@phase + window_size) % (window_size / @period)
 
         Buffer.new(*streams)
       end

data/lib/audio_stream/rate.rb

@@ -8,6 +8,7 @@ module AudioStream
     end
 
     def sec(soundinfo)
+      return @sec if @sec
       sample(soundinfo).to_f / soundinfo.samplerate
     end
 
@@ -33,6 +34,11 @@ module AudioStream
       end
     end
 
+    def freq(soundinfo)
+      return @freq if @freq
+      soundinfo.samplerate.to_f / sample(soundinfo)
+    end
+
     def frame_phase(soundinfo)
       sample_phase(soundinfo) * soundinfo.window_size
     end
@@ -41,58 +47,103 @@ module AudioStream
       2.0 * Math::PI / sample(soundinfo)
     end
 
+    def add(other, soundinfo)
+      other = self.class.sec(other)
+      self.class.new(sec: self.sec(soundinfo) + other.sec(soundinfo))
+    end
+
+    def *(other)
+      other = other.to_f
+
+      if @sample
+        return self.class.new(sample: @sample * other)
+      end
+
+      if @sec
+        return self.class.new(sec: @sec * other)
+      end
+
+      if @freq
+        return self.class.new(freq: @freq / other)
+      end
+
+      if @sync
+        return self.class.new(sync: @sync * other)
+      end
+    end
+
     def self.sec(v)
-      new(sec: v)
+      if self===v
+        v
+      else
+        new(sec: v)
+      end
     end
 
-    def self.millisec(v)
-      new(sec: v*0.001)
+    def self.msec(v)
+      if self===v
+        v
+      else
+        new(sec: v*0.001)
+      end
     end
 
     def self.sample(v)
-      new(sample: v)
+      if self===v
+        v
+      else
+        new(sample: v)
+      end
     end
 
     def self.freq(v)
-      new(freq: v)
+      if self===v
+        v
+      else
+        new(freq: v)
+      end
     end
 
     def self.sync(v)
-      new(sync: v)
+      if self===v
+        v
+      else
+        new(sync: v)
+      end
     end
 
 
-    SYNC_64     = sync(480 * 64)
-    SYNC_32     = sync(480 * 32)
-    SYNC_16     = sync(480 * 16)
-    SYNC_8      = sync(480 * 8)
-    SYNC_6      = sync(480 * 6)
-    SYNC_4      = sync(480 * 4)
-    SYNC_3      = sync(480 * 3)
-    SYNC_2      = sync(480 * 2)
-    SYNC_7_4    = sync(480 * 7 / 4)
-    SYNC_6_4    = sync(480 * 6 / 4)
-    SYNC_5_4    = sync(480 * 5 / 4)
-    SYNC_1      = sync(480 * 1)
-    SYNC_3_4    = sync(480 * 3 / 4)
-    SYNC_1_2    = sync(480 * 1 / 2)
-    SYNC_1_4D   = sync(480 * 1 / 4 * 3 / 2)
-    SYNC_1_4    = sync(480 * 1 / 4)
-    SYNC_1_4T   = sync(480 * 1 / 4 * 2 / 3)
-    SYNC_1_8D   = sync(480 * 1 / 8 * 3 / 2)
-    SYNC_1_8    = sync(480 * 1 / 8)
-    SYNC_1_8T   = sync(480 * 1 / 8 * 2 / 3)
-    SYNC_1_16D  = sync(480 * 1 / 16 * 3 / 2)
-    SYNC_1_16   = sync(480 * 1 / 16)
-    SYNC_1_16T  = sync(480 * 1 / 16 * 2 / 3)
-    SYNC_1_32D  = sync(480 * 1 / 32 * 3 / 2)
-    SYNC_1_32   = sync(480 * 1 / 32)
-    SYNC_1_32T  = sync(480 * 1 / 32 * 2 / 3)
-    SYNC_1_64D  = sync(480 * 1 / 64 * 3 / 2)
-    SYNC_1_64   = sync(480 * 1 / 64)
-    SYNC_1_64T  = sync(480 * 1 / 64 * 2 / 3)
-    SYNC_1_128D = sync(480 * 1 / 128 * 3 / 2)
-    SYNC_1_128  = sync(480 * 1 / 128)
-    SYNC_1_128T = sync(480 * 1 / 128 * 2 / 3)
+    SYNC_64     = sync(480 * 4 * 64)
+    SYNC_32     = sync(480 * 4 * 32)
+    SYNC_16     = sync(480 * 4 * 16)
+    SYNC_8      = sync(480 * 4 * 8)
+    SYNC_6      = sync(480 * 4 * 6)
+    SYNC_4      = sync(480 * 4 * 4)
+    SYNC_3      = sync(480 * 4 * 3)
+    SYNC_2      = sync(480 * 4 * 2)
+    SYNC_7_4    = sync(480 * 4 * 7 / 4)
+    SYNC_6_4    = sync(480 * 4 * 6 / 4)
+    SYNC_5_4    = sync(480 * 4 * 5 / 4)
+    SYNC_1      = sync(480 * 4 * 1)
+    SYNC_3_4    = sync(480 * 4 * 3 / 4)
+    SYNC_1_2    = sync(480 * 4 * 1 / 2)
+    SYNC_1_4D   = sync(480 * 4 * 1 / 4 * 3 / 2)
+    SYNC_1_4    = sync(480 * 4 * 1 / 4)
+    SYNC_1_4T   = sync(480 * 4 * 1 / 4 * 2 / 3)
+    SYNC_1_8D   = sync(480 * 4 * 1 / 8 * 3 / 2)
+    SYNC_1_8    = sync(480 * 4 * 1 / 8)
+    SYNC_1_8T   = sync(480 * 4 * 1 / 8 * 2 / 3)
+    SYNC_1_16D  = sync(480 * 4 * 1 / 16 * 3 / 2)
+    SYNC_1_16   = sync(480 * 4 * 1 / 16)
+    SYNC_1_16T  = sync(480 * 4 * 1 / 16 * 2 / 3)
+    SYNC_1_32D  = sync(480 * 4 * 1 / 32 * 3 / 2)
+    SYNC_1_32   = sync(480 * 4 * 1 / 32)
+    SYNC_1_32T  = sync(480 * 4 * 1 / 32 * 2 / 3)
+    SYNC_1_64D  = sync(480 * 4 * 1 / 64 * 3 / 2)
+    SYNC_1_64   = sync(480 * 4 * 1 / 64)
+    SYNC_1_64T  = sync(480 * 4 * 1 / 64 * 2 / 3)
+    SYNC_1_128D = sync(480 * 4 * 1 / 128 * 3 / 2)
+    SYNC_1_128  = sync(480 * 4 * 1 / 128)
+    SYNC_1_128T = sync(480 * 4 * 1 / 128 * 2 / 3)
   end
 end

data/lib/audio_stream/version.rb

@@ -1,3 +1,3 @@
 module AudioStream
-  VERSION = "3.3.0"
+  VERSION = "3.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: audio_stream
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-12-02 00:00:00.000000000 Z
+date: 2021-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,15 +138,28 @@ files:
 - audio_stream.gemspec
 - bin/console
 - bin/setup
-- examples/biquad.ipynb
-- examples/chorus.rb
-- examples/distortion.rb
-- examples/equalizer.ipynb
+- examples/bench_fx.rb
+- examples/canon.wav
 - examples/example_options.rb
+- examples/fx_chorus.rb
+- examples/fx_compressor.rb
+- examples/fx_convolution_reverb.rb
+- examples/fx_delay.rb
+- examples/fx_distortion.rb
+- examples/fx_noise_gate.rb
+- examples/fx_phaser.rb
+- examples/fx_schroeder_reverb.rb
+- examples/fx_vocoder.rb
+- examples/impulse_shaker.wav
+- examples/impulse_shaker_bigroom.wav
+- examples/impulse_shaker_smallhall.wav
 - examples/lpf.rb
 - examples/rec.rb
 - examples/tremolo.rb
 - examples/tuner.rb
+- jupyter/band_pass_filter.ipynb
+- jupyter/biquad.ipynb
+- jupyter/equalizer.ipynb
 - lib/audio_stream.rb
 - lib/audio_stream/audio_bus.rb
 - lib/audio_stream/audio_input.rb
@@ -208,7 +221,7 @@ metadata:
   homepage_uri: https://github.com/yoshida-eth0/ruby-audio_stream
   source_code_uri: https://github.com/yoshida-eth0/ruby-audio_stream
   changelog_uri: https://github.com/yoshida-eth0/ruby-audio_stream
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -223,8 +236,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: AudioStream is a Digital Audio Workstation for CLI
 test_files: []