audio_stream 1.3.0 → 1.4.0

data/lib/audio_stream/fx/biquad_filter.rb

@@ -36,11 +36,11 @@ module AudioStream
           }
         when 2
           window_size.times {|i|
-            input[i] = channels.times.map {|j|
-              b = @filter_bufs[j]
-              in0 = input[i][j]
-              process_one(in0, b)
-            }
+            input_i = input[i]
+            input[i] = [
+              process_one(input_i[0], @filter_bufs[0]),
+              process_one(input_i[1], @filter_bufs[1]),
+            ]
           }
         end
 
@@ -69,6 +69,57 @@ module AudioStream
 
         out0
       end
+
+      def plot_data(width=1000)
+        c = @filter_coef
+
+        b0 = c.b0 / c.a0
+        b1 = c.b1 / c.a0
+        b2 = c.b2 / c.a0
+        a1 = c.a1 / c.a0
+        a2 = c.a2 / c.a0
+
+        noctaves = 10
+        nyquist = @samplerate * 0.5
+
+        freq = []
+        x = []
+        width.times {|i|
+          f = i.to_f / width
+          f = 2.0 ** (noctaves * (f - 1.0))
+          freq << f
+          x << (f * nyquist)
+        }
+
+        mag_res = []
+        phase_res = []
+        width.times {|i|
+          omega = -Math::PI * freq[i]
+          z = Complex(Math.cos(omega), Math.sin(omega))
+          num = b0 + (b1 + b2 * z) * z
+          den = 1 + (a1 + a2 * z) * z
+          res = num / den
+
+          mag_res << Decibel.mag(res.abs).db
+          phase_res << 180 / Math::PI * Math.atan2(res.imag, res.real)
+        }
+
+        {x: x, magnitude: mag_res, phase: phase_res}
+      end
+
+      def plot(width=1000)
+        data = plot_data(width)
+
+        Plotly::Plot.new(
+          data: [{x: data[:x], y: data[:magnitude], name: 'Magnitude', yaxis: 'y1'}, {x: data[:x], y: data[:phase], name: 'Phase', yaxis: 'y2'}],
+          layout: {
+            xaxis: {title: 'Frequency (Hz)', type: 'log'},
+            yaxis: {side: 'left', title: 'Magnitude (dB)', showgrid: false},
+            yaxis2: {side: 'right', title: 'Phase (deg)', showgrid: false, overlaying: 'y'}
+          }
+        )
+      end
+
     end
   end
 end

data/lib/audio_stream/fx/convolution_reverb.rb

@@ -10,7 +10,7 @@ module AudioStream
         @window_size = impulse_bufs[0].size
         @dry_gain = dry
         @wet_gain = wet
-        @window = window || HanningWindow.new
+        @window = window || HanningWindow.instance
 
         zero_buf = Buffer.float(@window_size, @channels)
         if @channels==1

data/lib/audio_stream/fx/equalizer_2band.rb

@@ -3,21 +3,35 @@ module AudioStream
     class Equalizer2band
       include BangProcess
 
-      def initialize(soundinfo, lowgain:, highgain:)
-        @lowfreq = 400.0
-        @lowgain = lowgain
-
-        @highfreq = 4000.0
-        @highgain = highgain
-
-        @low_filter = LowShelfFilter.create(soundinfo, freq: @lowfreq, q: 1.0/Math.sqrt(2.0), gain: @lowgain)
-        @high_filter = HighShelfFilter.create(soundinfo, freq: @highfreq, q: 1.0/Math.sqrt(2.0), gain: @highgain)
+      def initialize(soundinfo, lowfreq: 400.0, lowgain:, highfreq: 4000.0, highgain:)
+        @low_filter = LowShelfFilter.create(soundinfo, freq: lowfreq, q: 1.0/Math.sqrt(2.0), gain: lowgain)
+        @high_filter = HighShelfFilter.create(soundinfo, freq: highfreq, q: 1.0/Math.sqrt(2.0), gain: highgain)
       end
 
       def process!(input)
         @low_filter.process!(input)
         @high_filter.process!(input)
       end
+
+      def plot(width=1000)
+        data1 = @low_filter.plot_data(width)
+        data2 = @high_filter.plot_data(width)
+
+        data = {
+          x: data1[:x],
+          magnitude: [data1[:magnitude], data2[:magnitude]].transpose.map {|a| a[0] + a[1]},
+          phase: [data1[:phase], data2[:phase]].transpose.map {|a| a[0] + a[1]},
+        }
+
+        Plotly::Plot.new(
+          data: [{x: data[:x], y: data[:magnitude], name: 'Magnitude', yaxis: 'y1'}, {x: data[:x], y: data[:phase], name: 'Phase', yaxis: 'y2'}],
+          layout: {
+            xaxis: {title: 'Frequency (Hz)', type: 'log'},
+            yaxis: {side: 'left', title: 'Magnitude (dB)', showgrid: false},
+            yaxis2: {side: 'right', title: 'Phase (deg)', showgrid: false, overlaying: 'y'}
+          }
+        )
+      end
     end
   end
 end

data/lib/audio_stream/fx/equalizer_3band.rb

@@ -3,19 +3,10 @@ module AudioStream
     class Equalizer3band
       include BangProcess
 
-      def initialize(soundinfo, lowgain:, midgain:, highgain:)
-        @lowfreq = 400.0
-        @lowgain = lowgain
-
-        @midfreq = 1000.0
-        @midgain = midgain
-
-        @highfreq = 4000.0
-        @highgain = highgain
-
-        @low_filter = LowShelfFilter.create(soundinfo, freq: @lowfreq, q: 1.0/Math.sqrt(2.0), gain: @lowgain)
-        @mid_filter = PeakingFilter.create(soundinfo, freq: @midfreq, bandwidth: 1.0/Math.sqrt(2.0), gain: @midgain)
-        @high_filter = HighShelfFilter.create(soundinfo, freq: @highfreq, q: 1.0/Math.sqrt(2.0), gain: @highgain)
+      def initialize(soundinfo, lowfreq: 400.0, lowgain:, midfreq: 1000.0, midgain:, highfreq: 4000.0, highgain:)
+        @low_filter = LowShelfFilter.create(soundinfo, freq: lowfreq, q: 1.0/Math.sqrt(2.0), gain: lowgain)
+        @mid_filter = PeakingFilter.create(soundinfo, freq: midfreq, bandwidth: 1.0/Math.sqrt(2.0), gain: midgain)
+        @high_filter = HighShelfFilter.create(soundinfo, freq: highfreq, q: 1.0/Math.sqrt(2.0), gain: highgain)
       end
 
       def process!(input)
@@ -23,6 +14,27 @@ module AudioStream
         @mid_filter.process!(input)
         @high_filter.process!(input)
       end
+
+      def plot(width=1000)
+        data1 = @low_filter.plot_data(width)
+        data2 = @mid_filter.plot_data(width)
+        data3 = @high_filter.plot_data(width)
+
+        data = {
+          x: data1[:x],
+          magnitude: [data1[:magnitude], data2[:magnitude], data3[:magnitude]].transpose.map {|a| a[0] + a[1] + a[2]},
+          phase: [data1[:phase], data2[:phase], data3[:phase]].transpose.map {|a| a[0] + a[1] + a[2]},
+        }
+
+        Plotly::Plot.new(
+          data: [{x: data[:x], y: data[:magnitude], name: 'Magnitude', yaxis: 'y1'}, {x: data[:x], y: data[:phase], name: 'Phase', yaxis: 'y2'}],
+          layout: {
+            xaxis: {title: 'Frequency (Hz)', type: 'log'},
+            yaxis: {side: 'left', title: 'Magnitude (dB)', showgrid: false},
+            yaxis2: {side: 'right', title: 'Phase (deg)', showgrid: false, overlaying: 'y'}
+          }
+        )
+      end
     end
   end
 end

data/lib/audio_stream/fx/peaking_filter.rb

@@ -12,7 +12,7 @@ module AudioStream
         a2 = 1.0 - alpha / a
         b0 = 1.0 + alpha * a
         b1 = -2.0 * Math.cos(omega)
-        b2 = 1.0 + alpha * a
+        b2 = 1.0 - alpha * a
 
         @filter_coef = FilterCoef.new(a0, a1, a2, b0, b1, b2)
       end

data/lib/audio_stream/version.rb

@@ -1,3 +1,3 @@
 module AudioStream
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/lib/audio_stream.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: audio_stream
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-27 00:00:00.000000000 Z
+date: 2019-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,9 +124,10 @@ files:
 - audio_stream.gemspec
 - bin/console
 - bin/setup
-- examples/buffer.ipynb
+- examples/biquad.ipynb
 - examples/chorus.rb
 - examples/distortion.rb
+- examples/equalizer.ipynb
 - examples/example_options.rb
 - examples/lpf.rb
 - examples/rec.rb
@@ -147,6 +148,7 @@ files:
 - lib/audio_stream/audio_output_file.rb
 - lib/audio_stream/buffer.rb
 - lib/audio_stream/conductor.rb
+- lib/audio_stream/decibel.rb
 - lib/audio_stream/error.rb
 - lib/audio_stream/fx.rb
 - lib/audio_stream/fx/a_gain.rb