audio_stream 1.4.0 → 1.5.0

data/lib/audio_stream/fx.rb

@@ -14,6 +14,7 @@ require 'audio_stream/fx/high_shelf_filter'
 require 'audio_stream/fx/peaking_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'

data/lib/audio_stream/fx/biquad_filter.rb

@@ -107,7 +107,7 @@ module AudioStream
         {x: x, magnitude: mag_res, phase: phase_res}
       end
 
-      def plot(width=1000)
+      def plot(width=500)
         data = plot_data(width)
 
         Plotly::Plot.new(

data/lib/audio_stream/fx/equalizer_2band.rb

@@ -13,7 +13,7 @@ module AudioStream
         @high_filter.process!(input)
       end
 
-      def plot(width=1000)
+      def plot(width=500)
         data1 = @low_filter.plot_data(width)
         data2 = @high_filter.plot_data(width)
 

data/lib/audio_stream/fx/equalizer_3band.rb

@@ -15,7 +15,7 @@ module AudioStream
         @high_filter.process!(input)
       end
 
-      def plot(width=1000)
+      def plot(width=500)
         data1 = @low_filter.plot_data(width)
         data2 = @mid_filter.plot_data(width)
         data3 = @high_filter.plot_data(width)

data/lib/audio_stream/fx/graphic_equalizer.rb

@@ -0,0 +1,43 @@
+module AudioStream
+  module Fx
+    class GraphicEqualizer
+      include BangProcess
+
+      def initialize(soundinfo)
+        @soundinfo = soundinfo
+        @filters = []
+      end
+
+      def add(freq:, bandwidth: nil, gain:)
+        bandwidth ||= 1.0/Math.sqrt(2.0)
+        @filters << PeakingFilter.create(@soundinfo, freq: freq, bandwidth: bandwidth, gain: gain)
+        self
+      end
+
+      def process!(input)
+        @filters.each {|filter|
+          filter.process!(input)
+        }
+      end
+
+      def plot(width=500)
+        data_arr = @filters.map{|filter| filter.plot_data(width)}
+
+        data = {
+          x: data_arr[0][:x],
+          magnitude: data_arr.map{|d| d[:magnitude]}.transpose.map {|a| a.sum},
+          phase: data_arr.map{|d| d[:phase]}.transpose.map {|a| a.sum},
+        }
+
+        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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: audio_stream
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
@@ -162,6 +162,7 @@ files:
 - lib/audio_stream/fx/distortion.rb
 - lib/audio_stream/fx/equalizer_2band.rb
 - lib/audio_stream/fx/equalizer_3band.rb
+- lib/audio_stream/fx/graphic_equalizer.rb
 - lib/audio_stream/fx/hanning_window.rb
 - lib/audio_stream/fx/high_pass_filter.rb
 - lib/audio_stream/fx/high_shelf_filter.rb