audio_stream 3.3.3 → 3.4.0

data/lib/audio_stream/fx/schroeder_reverb.rb

@@ -3,24 +3,23 @@ module AudioStream
     class SchroederReverb
 
       # @param soundinfo [AudioStream::SoundInfo]
-      # @param time [AudioStream::Rate] reverb time
-      # @param dry [AudioStream::Decibel] dry gain
-      # @param wet [AudioStream::Decibel] wet gain
-      def initialize(soundinfo, time:, dry: -1.0, wet: -20.0)
+      # @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: time * (39.85 * 0.002), q: 0.871402),
-          CombFilter.new(soundinfo, freq: time * (36.10 * 0.002), q: 0.882762),
-          CombFilter.new(soundinfo, freq: time * (33.27 * 0.002), q: 0.891443),
-          CombFilter.new(soundinfo, freq: time * (30.15 * 0.002), 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: 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 = Decibel.create(dry).mag
-        @wet = Decibel.create(wet).mag
+        @dry = Decibel.db(dry).mag
+        @wet = Decibel.db(wet).mag
       end
 
       def process(input)

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

@@ -47,6 +47,11 @@ 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
 
@@ -68,23 +73,43 @@ module AudioStream
     end
 
     def self.sec(v)
-      new(sec: v)
+      if self===v
+        v
+      else
+        new(sec: v)
+      end
     end
 
     def self.msec(v)
-      new(sec: v*0.001)
+      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
 
 

data/lib/audio_stream/version.rb

@@ -1,3 +1,3 @@
 module AudioStream
-  VERSION = "3.3.3"
+  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.3
+  version: 3.4.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-12-04 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: []