audio_stream 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abed71c7d4a93a7811ca8342ebc641a1311f36325589acfe5badf658dfee0aa8
-  data.tar.gz: 7de1e31ab2ac77a592cb08a5a746703e55beea6a30ba19bb06426318ebc3f5bc
+  metadata.gz: 5bcb3b9d97e49748ebdcca6bef4ef5288dfb0dd8a1211826ee529692928df52f
+  data.tar.gz: c508e385ac5a131734f6b4493132b926329d2cea39aa4feed9da79e837889cef
 SHA512:
-  metadata.gz: 8af114e5461e762d81fc7e924646a8a70a2fbd67edbb1840273a01eea2cb8a267d6946c5ef5ae13a52117a4315910ee7ff1235030001161838c535dcad218558
-  data.tar.gz: 1f96689851d1fc48d07ff1bcacf3f898f3a727fab92d9a1ca1a47ec3e281f0964be92910c1109506a1441ccc3ea9ef61f12e88f9c539e2859c2aac1ec1412680
+  metadata.gz: 78ac5a990115889d5a067bfdd3fa11273b57aacb6e8b90cf5c8e332af92c260a21a5d5ed3563c92c67ebe3b65deedd21884509eae7eb29a23c5117d2b553e13e
+  data.tar.gz: 17f43c4fdbdd178b749ce873e4a933d23ada7b4b845c07c038c43cdceb6ba4be83ef455c47f20b18dadfce3693d4ae56ad346273eaffab7574210b2cc94a9f7e

data/examples/distortion.rb

@@ -17,7 +17,7 @@ eq_2band = Equalizer2band.new($soundinfo, lowgain: 0.0, highgain: -10.0)
 # Bus
 
 bus1 = AudioBus.new
-stereo_out = AudioOutput.device(soundinfo: soundinfo)
+stereo_out = AudioOutput.device(soundinfo: $soundinfo)
 
 
 # Mixer

data/examples/lpf.rb

@@ -0,0 +1,40 @@
+require_relative 'example_options'
+
+
+# Track
+
+track1 = $input
+
+
+# Fx
+
+lpf = LowPassFilter.create($soundinfo, freq: 440.0, q: nil)
+hpf = HighPassFilter.create($soundinfo, freq: 440.0, q: nil)
+bpf = BandPassFilter.create($soundinfo, freq: 440.0, bandwidth: 10.0)
+lsf = LowShelfFilter.create($soundinfo, freq: 440.0, q: nil, gain: 1.0)
+hsf = HighShelfFilter.create($soundinfo, freq: 440.0, q: nil, gain: 1.0)
+eq_2band = Equalizer2band.new($soundinfo, lowgain: -15.0, highgain: 15.0)
+
+
+# Bus
+
+stereo_out = AudioOutput.device(soundinfo: $soundinfo)
+
+
+# Mixer
+
+track1
+  .stream
+  .fx(StereoToMono.new)
+  .fx(lpf)
+  .send_to(stereo_out)
+
+
+# start
+
+conductor = Conductor.new(
+  input: track1,
+  output: stereo_out
+)
+conductor.connect
+conductor.join

data/lib/audio_stream/audio_output.rb

@@ -10,8 +10,8 @@ module AudioStream
       AudioOutputFile.new(fname, soundinfo: soundinfo)
     end
 
-    def self.device(window_size=1024)
-      AudioOutputDevice.default_device(window_size)
+    def self.device(soundinfo:)
+      AudioOutputDevice.default_device(soundinfo: soundinfo)
     end
   end
 end

data/lib/audio_stream/fx/band_pass_filter.rb

@@ -2,18 +2,9 @@ module AudioStream
   module Fx
     class BandPassFilter < BiquadFilter
 
-      def initialize(soundinfo, freq:, bandwidth: 1.0)
-        super()
-        @samplerate = soundinfo.samplerate.to_f
-        @freq = freq
-        @bandwidth = bandwidth
-
-        filter_coef
-      end
-
-      def filter_coef
-        omega = 2.0 * Math::PI * @freq / @samplerate
-        alpha = Math.sin(omega) * Math.sinh(Math.log(2.0) / 2.0 * @bandwidth * omega / Math.sin(omega))
+      def update_coef(freq:, bandwidth:)
+        omega = 2.0 * Math::PI * freq / @samplerate
+        alpha = Math.sin(omega) * Math.sinh(Math.log(2.0) / 2.0 * bandwidth * omega / Math.sin(omega))
 
         a0 = 1.0 + alpha
         a1 = -2.0 * Math.cos(omega)
@@ -24,6 +15,13 @@ module AudioStream
 
         @filter_coef = FilterCoef.new(a0, a1, a2, b0, b1, b2)
       end
+
+      def self.create(soundinfo, freq:, bandwidth: 1.0)
+        filter = new(soundinfo)
+        filter.update_coef(freq: freq, bandwidth: bandwidth)
+
+        filter
+      end
     end
   end
 end

data/lib/audio_stream/fx/biquad_filter.rb

@@ -11,11 +11,16 @@ module AudioStream
 
       FilterCoef = Struct.new("FilterCoef", :a0, :a1, :a2, :b0, :b1, :b2)
 
-      def initialize
+      def initialize(soundinfo)
+        @samplerate = soundinfo.samplerate.to_f
+        init_buffer
+      end
+
+      def init_buffer
         @filter_bufs = [FilterBuffer.create, FilterBuffer.create]
       end
 
-      def filter_coef
+      def update_coef(*args, **kwargs)
         raise Error, "#{self.class.name}.filter_coef is not implemented"
       end
 

data/lib/audio_stream/fx/equalizer_2band.rb

@@ -10,8 +10,8 @@ module AudioStream
         @highfreq = 4000.0
         @highgain = highgain
 
-        @low_filter = LowShelfFilter.new(soundinfo, freq: @lowfreq, q: 1.0/Math.sqrt(2.0), gain: @lowgain)
-        @high_filter = HighShelfFilter.new(soundinfo, freq: @highfreq, q: 1.0/Math.sqrt(2.0), gain: @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)

data/lib/audio_stream/fx/equalizer_3band.rb

@@ -13,9 +13,9 @@ module AudioStream
         @highfreq = 4000.0
         @highgain = highgain
 
-        @low_filter = LowShelfFilter.new(soundinfo, freq: @lowfreq, q: 1.0/Math.sqrt(2.0), gain: @lowgain)
-        @mid_filter = PeakingFilter.new(soundinfo, freq: @midfreq, bandwidth: 1.0/Math.sqrt(2.0), gain: @midgain)
-        @high_filter = HighShelfFilter.new(soundinfo, freq: @highfreq, q: 1.0/Math.sqrt(2.0), gain: @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)

data/lib/audio_stream/fx/high_pass_filter.rb

@@ -2,18 +2,9 @@ module AudioStream
   module Fx
     class HighPassFilter < BiquadFilter
 
-      def initialize(soundinfo, freq:, q: nil)
-        super()
-        @samplerate = soundinfo.samplerate.to_f
-        @freq = freq
-        @q = q || 1.0 / Math.sqrt(2)
-
-        filter_coef
-      end
-
-      def filter_coef
-        omega = 2.0 * Math::PI * @freq / @samplerate
-        alpha = Math.sin(omega) / (2.0 * @q)
+      def update_coef(freq:, q:)
+        omega = 2.0 * Math::PI * freq / @samplerate
+        alpha = Math.sin(omega) / (2.0 * q)
 
         a0 = 1.0 + alpha
         a1 = -2.0 * Math.cos(omega)
@@ -24,6 +15,15 @@ module AudioStream
 
         @filter_coef = FilterCoef.new(a0, a1, a2, b0, b1, b2)
       end
+
+      def self.create(soundinfo, freq:, q: nil)
+        q ||= 1.0 / Math.sqrt(2)
+
+        filter = new(soundinfo)
+        filter.update_coef(freq: freq, q: q)
+
+        filter
+      end
     end
   end
 end

data/lib/audio_stream/fx/high_shelf_filter.rb

@@ -2,21 +2,11 @@ module AudioStream
   module Fx
     class HighShelfFilter < BiquadFilter
 
-      def initialize(soundinfo, freq:, q: nil, gain: 1.0)
-        super()
-        @samplerate = soundinfo.samplerate.to_f
-        @freq = freq
-        @q = q || 1.0 / Math.sqrt(2)
-        @gain = gain
-
-        filter_coef
-      end
-
-      def filter_coef
-        omega = 2.0 * Math::PI * @freq / @samplerate
-        alpha = Math.sin(omega) / (2.0 * @q)
-        a = 10.0 ** (@gain / 40.0)
-        beta = Math.sqrt(a) / @q
+      def update_coef(freq:, q:, gain:)
+        omega = 2.0 * Math::PI * freq / @samplerate
+        alpha = Math.sin(omega) / (2.0 * q)
+        a = 10.0 ** (gain / 40.0)
+        beta = Math.sqrt(a) / q
 
         a0 = (a+1) - (a-1) * Math.cos(omega) + beta * Math.sin(omega)
         a1 = 2.0 * ((a-1) - (a+1) * Math.cos(omega))
@@ -27,6 +17,15 @@ module AudioStream
 
         @filter_coef = FilterCoef.new(a0, a1, a2, b0, b1, b2)
       end
+
+      def self.create(soundinfo, freq:, q: nil, gain: 1.0)
+        q ||= 1.0 / Math.sqrt(2)
+
+        filter = new(soundinfo)
+        filter.update_coef(freq: freq, q: q, gain: gain)
+
+        filter
+      end
     end
   end
 end

data/lib/audio_stream/fx/low_pass_filter.rb

@@ -2,18 +2,9 @@ module AudioStream
   module Fx
     class LowPassFilter < BiquadFilter
 
-      def initialize(soundinfo, freq:, q: nil)
-        super()
-        @samplerate = soundinfo.samplerate.to_f
-        @freq = freq
-        @q = q || 1.0 / Math.sqrt(2)
-
-        filter_coef
-      end
-
-      def filter_coef
-        omega = 2.0 * Math::PI * @freq / @samplerate
-        alpha = Math.sin(omega) / (2.0 * @q)
+      def update_coef(freq:, q:)
+        omega = 2.0 * Math::PI * freq / @samplerate
+        alpha = Math.sin(omega) / (2.0 * q)
 
         a0 = 1.0 + alpha
         a1 = -2.0 * Math.cos(omega)
@@ -24,6 +15,15 @@ module AudioStream
 
         @filter_coef = FilterCoef.new(a0, a1, a2, b0, b1, b2)
       end
+
+      def self.create(soundinfo, freq:, q: nil)
+        q ||= 1.0 / Math.sqrt(2)
+
+        filter = new(soundinfo)
+        filter.update_coef(freq: freq, q: q)
+
+        filter
+      end
     end
   end
 end

data/lib/audio_stream/fx/low_shelf_filter.rb

@@ -2,21 +2,11 @@ module AudioStream
   module Fx
     class LowShelfFilter < BiquadFilter
 
-      def initialize(soundinfo, freq:, q: nil, gain: 1.0)
-        super()
-        @samplerate = soundinfo.samplerate.to_f
-        @freq = freq
-        @q = q || 1.0 / Math.sqrt(2)
-        @gain = gain
-
-        filter_coef
-      end
-
-      def filter_coef
-        omega = 2.0 * Math::PI * @freq / @samplerate
-        alpha = Math.sin(omega) / (2.0 * @q)
-        a = 10.0 ** (@gain / 40.0)
-        beta = Math.sqrt(a) / @q
+      def update_coef(freq:, q:, gain:)
+        omega = 2.0 * Math::PI * freq / @samplerate
+        alpha = Math.sin(omega) / (2.0 * q)
+        a = 10.0 ** (gain / 40.0)
+        beta = Math.sqrt(a) / q
 
         a0 = (a+1) + (a-1) * Math.cos(omega) + beta * Math.sin(omega)
         a1 = -2.0 * ((a-1) + (a+1) * Math.cos(omega))
@@ -27,6 +17,15 @@ module AudioStream
 
         @filter_coef = FilterCoef.new(a0, a1, a2, b0, b1, b2)
       end
+
+      def self.create(soundinfo, freq:, q: nil, gain: 1.0)
+        q ||= 1.0 / Math.sqrt(2)
+
+        filter = new(soundinfo)
+        filter.update_coef(freq: freq, q: q, gain: gain)
+
+        filter
+      end
     end
   end
 end

data/lib/audio_stream/fx/peaking_filter.rb

@@ -2,20 +2,10 @@ module AudioStream
   module Fx
     class PeakingFilter < BiquadFilter
 
-      def initialize(soundinfo, freq:, bandwidth: 1.0, gain: 40.0)
-        super()
-        @samplerate = soundinfo.samplerate.to_f
-        @freq = freq
-        @bandwidth = bandwidth
-        @gain = gain
-
-        filter_coef
-      end
-
-      def filter_coef
-        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)
+      def update_coef(freq:, bandwidth:, gain:)
+        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)
 
         a0 = 1.0 + alpha / a
         a1 = -2.0 * Math.cos(omega)
@@ -26,6 +16,13 @@ module AudioStream
 
         @filter_coef = FilterCoef.new(a0, a1, a2, b0, b1, b2)
       end
+
+      def self.create(soundinfo, freq:, bandwidth: 1.0, gain: 40.0)
+        filter = new(soundinfo)
+        filter.update_coef(freq: freq, bandwidth: bandwidth, gain: gain)
+
+        filter
+      end
     end
   end
 end

data/lib/audio_stream/version.rb

@@ -1,3 +1,3 @@
 module AudioStream
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: audio_stream
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-17 00:00:00.000000000 Z
+date: 2019-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,6 +142,7 @@ files:
 - examples/chorus.rb
 - examples/distortion.rb
 - examples/example_options.rb
+- examples/lpf.rb
 - examples/rec.rb
 - examples/tremolo.rb
 - examples/tuner.rb