audio_stream 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1bdc59349cd6ef2c49c5cbc140c15037225f32f852a32ca6e951041b7a30711
-  data.tar.gz: 31694954a02b8920b3da085cba2ac5dfa46c851e44d44f5cf0cefa871b76e1ce
+  metadata.gz: 0011df46c8c5a4ca83fac3301ca638940087710da3dd996382a354d9aa19596f
+  data.tar.gz: d88cb6715119d98bd02ee980be8cf9446b3a729a8de5003cf77a0dc0f958501a
 SHA512:
-  metadata.gz: f88c300ac5d2e45e2c7b8b9d4de0aba54a49b22542478c7ba0ae7408140df727cc6ffb66b68f8d6a1353cea462a678ec2bcd6ed4681684ec2c87cfa71d2404a5
-  data.tar.gz: b5281f647673f887c4e001e72c29e678614a064be79fc199156774dfeba2a9c9a51da49f4a58fdbd14a05fa339ced998186b54146f1a7d7c26f134c676d2a9a5
+  metadata.gz: 7059283b291c17fec85bcd40f194d8312a0f2539fe093a31268c5361f6a00517390a5d5c56df72cedb9dcc8432100a066834dee1fde4872039cf5adc2524c58c
+  data.tar.gz: 55340551e2da2ce9dcd87c89261b71868687d30ab65167f05552402c10d2e227337ccc7bba0c5ae9c7ebc737e779fa85952fb3056db3a7b5a1a65423fcffeed2

data/lib/audio_stream.rb

@@ -9,6 +9,7 @@ require 'audio_stream/version'
 require 'audio_stream/error'
 require 'audio_stream/sound_info'
 require 'audio_stream/decibel'
+require 'audio_stream/rate'
 require 'audio_stream/buffer'
 require 'audio_stream/ring_buffer'
 require 'audio_stream/sync'

data/lib/audio_stream/audio_bus.rb

@@ -10,7 +10,7 @@ module AudioStream
     end
 
     def add(observable, gain:, pan:)
-      if gain && gain!=1.0
+      if gain && gain!=0.0
         observable = observable.fx(Fx::AGain.new(level: gain))
       end
 

data/lib/audio_stream/buffer.rb

@@ -100,7 +100,7 @@ module AudioStream
       dst = buffers.inject(:+)
 
       if average
-        gain = AGain.new(level: 1.0/buffers.length)
+        gain = AGain.new(level: Decibel.mag(1.0/buffers.length))
         dst = gain.process(dst)
       end
 

data/lib/audio_stream/decibel.rb

@@ -20,5 +20,13 @@ module AudioStream
     def self.mag(mag)
       new(mag: mag)
     end
+
+    def self.create(val)
+      if self===val
+        val
+      else
+        new(db: val.to_f)
+      end
+    end
   end
 end

data/lib/audio_stream/fx/a_gain.rb

@@ -1,8 +1,13 @@
 module AudioStream
   module Fx
     class AGain
-      def initialize(level: 1.0)
-        @level = level
+      # @param level [AudioStream::Decibel] Amplification level
+      def initialize(level:)
+        if Decibel===level
+          @level = level.mag
+        else
+          @level = Decibel.db(level).mag
+        end
       end
 
       def process(input)

data/lib/audio_stream/fx/all_pass_filter.rb

@@ -19,6 +19,9 @@ module AudioStream
         }
       end
 
+      # @param soundinfo [AudioStream::SoundInfo]
+      # @param freq [Float] Cutoff frequency
+      # @param q [Float] Quality factor
       def self.create(soundinfo, freq:, q: DEFAULT_Q)
         filter = new(soundinfo)
         filter.update_coef(freq: freq, q: q)

data/lib/audio_stream/fx/band_pass_filter.rb

@@ -19,6 +19,9 @@ module AudioStream
         }
       end
 
+      # @param soundinfo [AudioStream::SoundInfo]
+      # @param freq [Float] Center frequency
+      # @param bandwidth [Float] bandwidth (octave)
       def self.create(soundinfo, freq:, bandwidth: 1.0)
         filter = new(soundinfo)
         filter.update_coef(freq: freq, bandwidth: bandwidth)

data/lib/audio_stream/fx/comb_filter.rb

@@ -2,10 +2,12 @@ module AudioStream
   module Fx
     class CombFilter
 
+      # @param soundinfo [AudioStream::SoundInfo]
+      # @param freq [AudioStream::Rate] frequency
+      # @param q [Float] Quality factor
       def initialize(soundinfo, freq:, q:)
         @window_size = soundinfo.window_size
-        @samplerate = soundinfo.samplerate
-        @delaysample = (soundinfo.samplerate.to_f / freq).round
+        @delaysample = freq.sample(soundinfo).round
         @q = q
 
         @delaybufs = [

data/lib/audio_stream/fx/delay.rb

@@ -1,12 +1,15 @@
 module AudioStream
   module Fx
     class Delay
+      # @param soundinfo [AudioStream::SoundInfo]
+      # @param time [AudioStream::Rate] delay time
+      # @param level [AudioStream::Decibel] wet gain
+      # @param feedback [AudioStream::Decibel] feedback level
       def initialize(soundinfo, time:, level:, feedback:)
-        @time = time
-        @level = level
-        @feedback = feedback
+        @level = Decibel.create(level).mag
+        @feedback = Decibel.create(feedback).mag
 
-        @delaysample = (soundinfo.samplerate * time).round
+        @delaysample = time.sample(soundinfo).round
         @delaybuf0 = Array.new(@delaysample, 0.0)
         @delaybuf1 = Array.new(@delaysample, 0.0)
         @seek = 0

data/lib/audio_stream/fx/distortion.rb

@@ -1,9 +1,11 @@
 module AudioStream
   module Fx
     class Distortion
-      def initialize(gain: 100, level: 0.1)
-        @gain = gain
-        @level = level
+      # @param gain [AudioStream::Decibel] input gain
+      # @param level [AudioStream::Decibel] output level
+      def initialize(gain: 40.0, level: -20.0)
+        @gain = Decibel.create(gain).mag
+        @level = Decibel.create(level).mag
       end
 
       def process(input)

data/lib/audio_stream/fx/equalizer_2band.rb

@@ -1,6 +1,9 @@
 module AudioStream
   module Fx
     class Equalizer2band
+      # @param freq [Float] Cutoff frequency
+      # @param q [Float] Quality factor
+      # @param gain [AudioStream::Decibel] Amplification level at cutoff frequency
       def initialize(soundinfo, lowfreq: 400.0, lowgain:, highfreq: 4000.0, highgain:)
         @low_filter = LowShelfFilter.create(soundinfo, freq: lowfreq, q: BiquadFilter::DEFAULT_Q, gain: lowgain)
         @high_filter = HighShelfFilter.create(soundinfo, freq: highfreq, q: BiquadFilter::DEFAULT_Q, gain: highgain)

data/lib/audio_stream/fx/high_pass_filter.rb

@@ -19,6 +19,9 @@ module AudioStream
         }
       end
 
+      # @param soundinfo [AudioStream::SoundInfo]
+      # @param freq [Float] Cutoff frequency
+      # @param q [Float] Quality factor
       def self.create(soundinfo, freq:, q: DEFAULT_Q)
         filter = new(soundinfo)
         filter.update_coef(freq: freq, q: q)

data/lib/audio_stream/fx/high_shelf_filter.rb

@@ -3,6 +3,10 @@ module AudioStream
     class HighShelfFilter < BiquadFilter
 
       def update_coef(freq:, q:, gain:)
+        if Decibel===gain
+          gain = gain.db
+        end
+
         omega = 2.0 * Math::PI * freq / @samplerate
         alpha = Math.sin(omega) / (2.0 * q)
         a = 10.0 ** (gain / 40.0)
@@ -21,6 +25,10 @@ module AudioStream
         }
       end
 
+      # @param soundinfo [AudioStream::SoundInfo]
+      # @param freq [Float] Cutoff frequency
+      # @param q [Float] Quality factor
+      # @param gain [AudioStream::Decibel] Amplification level at cutoff frequency
       def self.create(soundinfo, freq:, q: DEFAULT_Q, gain: 1.0)
         filter = new(soundinfo)
         filter.update_coef(freq: freq, q: q, gain: gain)

data/lib/audio_stream/fx/low_pass_filter.rb

@@ -19,6 +19,9 @@ module AudioStream
         }
       end
 
+      # @param soundinfo [AudioStream::SoundInfo]
+      # @param freq [Float] Cutoff frequency
+      # @param q [Float] Quality factor
       def self.create(soundinfo, freq:, q: DEFAULT_Q)
         filter = new(soundinfo)
         filter.update_coef(freq: freq, q: q)

data/lib/audio_stream/fx/low_shelf_filter.rb

@@ -3,6 +3,10 @@ module AudioStream
     class LowShelfFilter < BiquadFilter
 
       def update_coef(freq:, q:, gain:)
+        if Decibel===gain
+          gain = gain.db
+        end
+
         omega = 2.0 * Math::PI * freq / @samplerate
         alpha = Math.sin(omega) / (2.0 * q)
         a = 10.0 ** (gain / 40.0)
@@ -21,6 +25,10 @@ module AudioStream
         }
       end
 
+      # @param soundinfo [AudioStream::SoundInfo]
+      # @param freq [Float] Cutoff frequency
+      # @param q [Float] Quality factor
+      # @param gain [AudioStream::Decibel] Amplification level at cutoff frequency
       def self.create(soundinfo, freq:, q: DEFAULT_Q, gain: 1.0)
         filter = new(soundinfo)
         filter.update_coef(freq: freq, q: q, gain: gain)

data/lib/audio_stream/fx/peaking_filter.rb

@@ -3,6 +3,10 @@ module AudioStream
     class PeakingFilter < BiquadFilter
 
       def update_coef(freq:, bandwidth:, gain:)
+        if Decibel===gain
+          gain = gain.db
+        end
+
         omega = 2.0 * Math::PI * freq / @samplerate
         alpha = Math.sin(omega) * Math.sinh(Math.log(2.0) / 2.0 * bandwidth * omega / Math.sin(omega))
         a = 10.0 ** (gain / 40.0)
@@ -20,6 +24,10 @@ module AudioStream
         }
       end
 
+      # @param soundinfo [AudioStream::SoundInfo]
+      # @param freq [Float] Cutoff frequency
+      # @param bandwidth [Float] bandwidth (octave)
+      # @param gain [AudioStream::Decibel] Amplification level at cutoff frequency
       def self.create(soundinfo, freq:, bandwidth: 1.0, gain: 40.0)
         filter = new(soundinfo)
         filter.update_coef(freq: freq, bandwidth: bandwidth, gain: gain)

data/lib/audio_stream/fx/phaser.rb

@@ -2,7 +2,13 @@ module AudioStream
   module Fx
     class Phaser
 
-      def initialize(soundinfo, rate:, depth:, freq:, dry: 0.5, wet: 0.5)
+      # @param soundinfo [AudioStream::SoundInfo]
+      # @param rate [AudioStream::Rate] modulation speed
+      # @param depth [Float] frequency modulation depth
+      # @param freq [Float] Base cutoff frequency
+      # @param dry [AudioStream::Decibel] dry gain
+      # @param wet [AudioStream::Decibel] wet gain
+      def initialize(soundinfo, rate:, depth:, freq:, dry: -6.0, wet: -6.0)
         @soundinfo = soundinfo
 
         @filters = [
@@ -10,19 +16,19 @@ module AudioStream
           AllPassFilter.new(soundinfo),
         ]
 
-        @speed = 2.0 * Math::PI * rate / @soundinfo.samplerate
+        @speed = rate.frame_phase(soundinfo)
         @phase = 0
 
         @depth = depth
         @freq = freq
 
-        @dry = dry
-        @wet = wet
+        @dry = Decibel.create(dry).mag
+        @wet = Decibel.create(wet).mag
       end
 
       def process(input)
         window_size = input.window_size
-        @phase = (@phase + @speed * window_size) % (window_size / @speed)
+        @phase = (@phase + @speed) % (2.0 * Math::PI)
 
         a = Math.sin(@phase) * 0.5 + 0.5
         apf_freq = @freq * (1.0 + a * @depth)

data/lib/audio_stream/fx/vocoder.rb

@@ -3,6 +3,9 @@ module AudioStream
     class Vocoder
       include MultiAudioInputtable
 
+      # @param soundinfo [AudioStream::SoundInfo]
+      # @param shift [Float] modulator pitch shift. 1.0=1semitone
+      # @param bandwidth [Float] bandwidth (octave)
       def initialize(soundinfo, shift: 0, bandwidth: 0.2)
         regist_audio_input(:main)
         regist_audio_input(:side)

data/lib/audio_stream/rate.rb

@@ -0,0 +1,98 @@
+module AudioStream
+  class Rate
+    def initialize(sec: nil, sample: nil, freq: nil, sync: nil)
+      @sec = sec
+      @sample = sample
+      @freq = freq
+      @sync = sync
+    end
+
+    def sec(soundinfo)
+      sample(soundinfo).to_f / soundinfo.samplerate
+    end
+
+    def frame(soundinfo)
+      sample(soundinfo).to_f / soundinfo.window_size
+    end
+
+    def sample(soundinfo)
+      if @sample
+        return @sample
+      end
+
+      if @sec
+        return @sec.to_f * soundinfo.samplerate
+      end
+
+      if @freq
+        return soundinfo.samplerate.to_f / @freq
+      end
+
+      if @sync
+        return @sync / 480.0 * soundinfo.sync_rate
+      end
+    end
+
+    def frame_phase(soundinfo)
+      sample_phase(soundinfo) * soundinfo.window_size
+    end
+
+    def sample_phase(soundinfo)
+      2.0 * Math::PI / sample(soundinfo)
+    end
+
+    def self.sec(v)
+      new(sec: v)
+    end
+
+    def self.millisec(v)
+      new(sec: v*0.001)
+    end
+
+    def self.sample(v)
+      new(sample: v)
+    end
+
+    def self.freq(v)
+      new(freq: v)
+    end
+
+    def self.sync(v)
+      new(sync: v)
+    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)
+  end
+end

data/lib/audio_stream/sound_info.rb

@@ -1,13 +1,24 @@
 module AudioStream
   class SoundInfo < RubyAudio::SoundInfo
     attr_accessor :window_size
+    attr_reader :bpm
+    attr_reader :bps
 
     def framerate
       self.samplerate.to_f / self.window_size
     end
 
+    def bpm=(bpm)
+      @bpm = bpm.to_f
+      @bps = @bpm / 60.0
+    end
+
+    def sync_rate
+      self.samplerate.to_f / self.bps
+    end
+
     def clone
-      SoundInfo.new(channels: channels, samplerate: samplerate, format: format, window_size: window_size)
+      SoundInfo.new(channels: channels, samplerate: samplerate, format: format, window_size: window_size, bpm: bpm)
     end
   end
 end

data/lib/audio_stream/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: audio_stream
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-17 00:00:00.000000000 Z
+date: 2019-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -196,6 +196,7 @@ files:
 - lib/audio_stream/fx/tremolo.rb
 - lib/audio_stream/fx/tuner.rb
 - lib/audio_stream/fx/vocoder.rb
+- lib/audio_stream/rate.rb
 - lib/audio_stream/ring_buffer.rb
 - lib/audio_stream/sound_info.rb
 - lib/audio_stream/sync.rb