audio_stream 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b2b4231db7c1e5aeed85c42c10f9071cbd7bea36a7b286d72c712645a4b4a74
-  data.tar.gz: 170ebe1b6acef7cd7816dd971a7539cd2a321bdb826ab6455d8764e5127eeb9d
+  metadata.gz: b66dd6e651e9b7e179c17382ecfe8a18a1a35181a4df247a1ad960c1314d723b
+  data.tar.gz: 49019f9eeb61ab81f10277f931afb6e5f9e2710294dd43d9c20ac1c70d907d60
 SHA512:
-  metadata.gz: 2913207ae700123f3fe2ad297894d9167220aac59da9cba1c5086ee3304bd1cc2fa7f5a19ffccdcc8ddd20affd6846955245453502b4f8984444effdd5a5d9de
-  data.tar.gz: c03e01db92754fd39ad397073641d50519928463a73d0727bd71300075f18eef45dc0d18e068e6135925d6ef7613b8d372ea696fbe432170ff805659995099a7
+  metadata.gz: 2e1da05fe284fc2bf71fab340b605ccc7354461497163ec36638304b8602ab431dacab37e2aa6d5184adc1fb28884e5b67a4f989733890aa9ed7e9753bc268d5
+  data.tar.gz: 2ac60347cf0f12750be2006fdf91721ea7e4982bfda46096dbf5ef94ddeb64a344a11452814a3645688b3ef3c5af02a08973c67f1196dcb179c3f3b77e6fb454

data/audio_stream.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 
+  spec.add_dependency "vdsp", ">= 1.6.0"
   spec.add_dependency "ruby-audio", ">= 1.6.1"
   spec.add_dependency "coreaudio", ">= 0.0.12"
   spec.add_dependency "ruby-fftw3", ">= 1.0.2"

data/lib/audio_stream.rb

@@ -1,5 +1,6 @@
 require 'ruby-audio'
 require 'coreaudio'
+require 'vdsp'
 require 'numru/fftw3'
 require 'rbplotly'
 require 'singleton'

data/lib/audio_stream/buffer.rb

@@ -6,6 +6,13 @@ module AudioStream
     attr_reader :window_size
 
     def initialize(stream0, stream1=nil)
+      if Array===stream0
+        stream0 = Vdsp::DoubleArray.create(stream0)
+      end
+      if Array===stream1
+        stream1 = Vdsp::DoubleArray.create(stream1)
+      end
+
       @stream0 = stream0
       @stream1 = stream1
 
@@ -58,53 +65,45 @@ module AudioStream
     end
 
     def +(other)
-      self.class.merge([self, other])
-    end
+      if self.window_size!=other.window_size
+        raise Error, "Buffer.window_size is not match: self.window_size=#{self.window_size} other.window_size=#{other.window_size}"
+      end
 
-    def self.merge(buffers, average: false)
-      if buffers.length==0
-        raise Error, "argument is empty"
-      elsif buffers.length==1
-        return buffers.first.clone
+      channels = [self.channels, other.channels].max
+      case channels
+      when 1
+        stream0 = self.streams[0] + other.streams[0]
+        self.class.new(stream0)
+      when 2
+        st_self = self.stereo
+        st_other = other.stereo
+
+        stream0 = st_self.streams[0] + st_other.streams[0]
+        stream1 = st_self.streams[1] + st_other.streams[1]
+        self.class.new(stream0, stream1)
       end
+    end
 
+    def self.merge(buffers, average: false)
       buffers.each {|buf|
         unless Buffer===buf
           raise Error, "argument is not Buffer: #{buf}"
         end
-        if buffers[0].window_size!=buf.window_size
-          i = buffers.index(buf)
-          raise Error, "Buffer.window_size is not match: buffers[0].window_size=#{buffers[0].window_size} buffers[#{i}].window_size=#{buf.window_size}"
-        end
       }
 
-      channels = buffers.map(&:channels).max
-      window_size = buffers[0].window_size
-      avg = average ? buffers.size.to_f : 1.0
+      if buffers.length==0
+        raise Error, "argument is empty"
+      elsif buffers.length==1
+        return buffers[0]
+      end
 
-      case channels
-      when 1
-        result0 = Array.new(window_size, 0.0)
-        buffers.each {|buf|
-          buf.streams[0].each_with_index {|f, i|
-            result0[i] += f / avg
-          }
-        }
-        self.class.new(result0)
-      when 2
-        result0 = Array.new(window_size, 0.0)
-        result1 = Array.new(window_size, 0.0)
-        buffers.each {|buf|
-          buf = buf.stereo
-          src0 = buf.streams[0]
-          src1 = buf.streams[1]
-          window_size.times {|i|
-            result0[i] += src0[i] / avg
-            result1[i] += src1[i] / avg
-          }
-        }
-        self.new(result0, result1)
+      dst = buffers.inject(:+)
+
+      if average
+        dst /= buffers.length.to_f
       end
+
+      dst
     end
 
     def plot
@@ -147,10 +146,10 @@ module AudioStream
 
       case channels
       when 1
-        na[(0+offset)...(window_size+offset)] = @stream0
+        na[(0+offset)...(window_size+offset)] = @stream0.to_a
       when 2
-        na[window_size.times.map{|i| i*2+offset}] = @stream0
-        na[window_size.times.map{|i| i*2+1+offset}] = @stream1
+        na[window_size.times.map{|i| i*2+offset}] = @stream0.to_a
+        na[window_size.times.map{|i| i*2+1+offset}] = @stream1.to_a
       end
 
       na
@@ -175,12 +174,14 @@ module AudioStream
 
       case channels
       when 1
-        window_size.times {|i|
-          rabuf[i] = @stream0[i]
+        @stream0.each {|v|
+          rabuf[i] = v
         }
       when 2
+        stream0 = @stream0.to_a
+        stream1 = @stream1.to_a
         window_size.times {|i|
-          rabuf[i] = [@stream0[i], @stream0[i]]
+          rabuf[i] = [stream0[i], stream1[i]]
         }
       end
 
@@ -197,13 +198,13 @@ module AudioStream
     end
 
     def self.create_mono(window_size)
-      stream0 = Array.new(window_size, 0.0)
+      stream0 = Vdsp::DoubleArray.new(window_size)
       new(stream0)
     end
 
     def self.create_stereo(window_size)
-      stream0 = Array.new(window_size, 0.0)
-      stream1 = Array.new(window_size, 0.0)
+      stream0 = Vdsp::DoubleArray.new(window_size)
+      stream1 = Vdsp::DoubleArray.new(window_size)
       new(stream0, stream1)
     end
 
@@ -220,17 +221,17 @@ module AudioStream
 
       case channels
       when 1
-        stream0 = Array.new(window_size, 0.0)
+        stream0 = []
         window_size.times {|i|
-          stream0[i] = na[i].real / max
+          stream0 << na[i].real / max
         }
         self.new(stream0)
       when 2
-        stream0 = Array.new(window_size, 0.0)
-        stream1 = Array.new(window_size, 0.0)
+        stream0 = []
+        stream1 = []
         window_size.times {|i|
-          stream0[i] = na[i*2].real / max
-          stream1[i] = na[(i*2)+1].real / max
+          stream0 << na[i*2].real / max
+          stream1 << na[(i*2)+1].real / max
         }
         self.new(stream0, stream1)
       end
@@ -242,17 +243,14 @@ module AudioStream
 
       case channels
       when 1
-        stream0 = Array.new(window_size, 0.0)
-        rabuf.each_with_index {|f, i|
-          stream0[i] = f
-        }
+        stream0 = rabuf.to_a
         self.new(stream0)
       when 2
-        stream0 = Array.new(window_size, 0.0)
-        stream1 = Array.new(window_size, 0.0)
+        stream0 = []
+        stream1 = []
         rabuf.each_with_index {|fa, i|
-          stream0[i] = fa[0]
-          stream1[i] = fa[1]
+          stream0 << fa[0]
+          stream1 << fa[1]
         }
         self.new(stream0, stream1)
       end

data/lib/audio_stream/fx/a_gain.rb

@@ -9,9 +9,7 @@ module AudioStream
         return input if @level==1.0
 
         streams = input.streams.map {|stream|
-          stream.map {|f|
-            f * @level
-          }
+          stream * @level
         }
         Buffer.new(*streams)
       end

data/lib/audio_stream/fx/band_pass_filter.rb

@@ -13,7 +13,10 @@ module AudioStream
         b1 = 0.0
         b2 = -alpha
 
-        @filter_coef = FilterCoef.new(a0, a1, a2, b0, b1, b2)
+        @coef = Vdsp::Biquad::Coefficient.new(b0/a0, b1/a0, b2/a0, a1/a0, a2/a0)
+        @biquads.each {|biquad|
+          biquad.coefficients = @coef
+        }
       end
 
       def self.create(soundinfo, freq:, bandwidth: 1.0)

data/lib/audio_stream/fx/biquad_filter.rb

@@ -1,23 +1,14 @@
 module AudioStream
   module Fx
     class BiquadFilter
-      FilterBuffer = Struct.new("FilterBuffer", :in1, :in2, :out1, :out2) do
-        def self.create
-          new(0.0, 0.0, 0.0, 0.0)
-        end
-      end
-
-      FilterCoef = Struct.new("FilterCoef", :a0, :a1, :a2, :b0, :b1, :b2)
-
       DEFAULT_Q = 1.0 / Math.sqrt(2.0)
 
       def initialize(soundinfo)
         @samplerate = soundinfo.samplerate.to_f
-        init_buffer
-      end
-
-      def init_buffer
-        @filter_bufs = [FilterBuffer.create, FilterBuffer.create]
+        @biquads = [
+          Vdsp::DoubleBiquad.new(1),
+          Vdsp::DoubleBiquad.new(1),
+        ]
       end
 
       def update_coef(*args, **kwargs)
@@ -25,49 +16,25 @@ module AudioStream
       end
 
       def process(input)
-        window_size = input.window_size
         channels = input.channels
 
-        streams = input.streams.map.with_index {|stream, i|
-          b = @filter_bufs[i]
-          stream.map {|f|
-            process_one(f, b)
-          }
-        }
-        Buffer.new(*streams)
-      end
-
-      def process_mono(in0)
-        process_one(in0, @filter_bufs[0])
-      end
-
-      def process_stereo(in0, in1)
-        [
-          process_one(in0, @filter_bufs[0]),
-          process_one(in1, @filter_bufs[1])
-        ]
-      end
-
-      def process_one(in0, b)
-        c = @filter_coef
-        out0 = c.b0/c.a0 * in0 + c.b1/c.a0 * b.in1 + c.b2/c.a0 * b.in2 - c.a1/c.a0 * b.out1 - c.a2/c.a0 * b.out2
-
-        b.in2 = b.in1
-        b.in1 = in0
-        b.out2 = b.out1
-        b.out1 = out0
-
-        out0
+        case channels
+        when 1
+          dst0 = @biquads[0].apply(input.streams[0])
+          Buffer.new(dst0)
+        when 2
+          dst0 = @biquads[0].apply(input.streams[0])
+          dst1 = @biquads[1].apply(input.streams[1])
+          Buffer.new(dst0, dst1)
+        end
       end
 
       def plot_data(width=500)
-        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
+        b0 = @coef.b0
+        b1 = @coef.b1
+        b2 = @coef.b2
+        a1 = @coef.a1
+        a2 = @coef.a2
 
         noctaves = 10
         nyquist = @samplerate * 0.5

data/lib/audio_stream/fx/high_pass_filter.rb

@@ -13,7 +13,10 @@ module AudioStream
         b1 = -(1.0 + Math.cos(omega))
         b2 = (1.0 + Math.cos(omega)) / 2.0 
 
-        @filter_coef = FilterCoef.new(a0, a1, a2, b0, b1, b2)
+        @coef = Vdsp::Biquad::Coefficient.new(b0/a0, b1/a0, b2/a0, a1/a0, a2/a0)
+        @biquads.each {|biquad|
+          biquad.coefficients = @coef
+        }
       end
 
       def self.create(soundinfo, freq:, q: DEFAULT_Q)

data/lib/audio_stream/fx/high_shelf_filter.rb

@@ -15,7 +15,10 @@ module AudioStream
         b1 = -2.0 * a * ((a-1) + (a+1) * Math.cos(omega))
         b2 = a * ((a+1) + (a-1) * Math.cos(omega) - beta * Math.sin(omega))
 
-        @filter_coef = FilterCoef.new(a0, a1, a2, b0, b1, b2)
+        @coef = Vdsp::Biquad::Coefficient.new(b0/a0, b1/a0, b2/a0, a1/a0, a2/a0)
+        @biquads.each {|biquad|
+          biquad.coefficients = @coef
+        }
       end
 
       def self.create(soundinfo, freq:, q: DEFAULT_Q, gain: 1.0)

data/lib/audio_stream/fx/low_pass_filter.rb

@@ -13,7 +13,10 @@ module AudioStream
         b1 = 1.0 - Math.cos(omega)
         b2 = (1.0 - Math.cos(omega)) / 2.0 
 
-        @filter_coef = FilterCoef.new(a0, a1, a2, b0, b1, b2)
+        @coef = Vdsp::Biquad::Coefficient.new(b0/a0, b1/a0, b2/a0, a1/a0, a2/a0)
+        @biquads.each {|biquad|
+          biquad.coefficients = @coef
+        }
       end
 
       def self.create(soundinfo, freq:, q: DEFAULT_Q)

data/lib/audio_stream/fx/low_shelf_filter.rb

@@ -15,7 +15,10 @@ module AudioStream
         b1 = 2.0 * a * ((a-1) - (a+1) * Math.cos(omega))
         b2 = a * ((a+1) - (a-1) * Math.cos(omega) - beta * Math.sin(omega))
 
-        @filter_coef = FilterCoef.new(a0, a1, a2, b0, b1, b2)
+        @coef = Vdsp::Biquad::Coefficient.new(b0/a0, b1/a0, b2/a0, a1/a0, a2/a0)
+        @biquads.each {|biquad|
+          biquad.coefficients = @coef
+        }
       end
 
       def self.create(soundinfo, freq:, q: DEFAULT_Q, gain: 1.0)

data/lib/audio_stream/fx/panning.rb

@@ -4,43 +4,42 @@ module AudioStream
       def initialize(pan: 0.0)
         @pan = pan
 
-        @l_gain = 1.0 - pan
-        @lr_gain = 0.0
-        if 1.0<@l_gain
-          @lr_gain = @l_gain - 1.0
-          @l_gain = 1.0
+        l_gain = 1.0 - pan
+        lr_gain = 0.0
+        if 1.0<l_gain
+          lr_gain = l_gain - 1.0
+          l_gain = 1.0
         end
 
-        @r_gain = 1.0 + pan
-        @rl_gain = 0.0
-        if 1.0<@r_gain
-          @rl_gain = @r_gain - 1.0
-          @r_gain = 1.0
+        r_gain = 1.0 + pan
+        rl_gain = 0.0
+        if 1.0<r_gain
+          rl_gain = r_gain - 1.0
+          r_gain = 1.0
         end
 
-        @normalize = [1.0 - pan, 1.0 + pan].max
+        normalize = [1.0 - pan, 1.0 + pan].max
+
+        @r_gain = r_gain / normalize
+        @rl_gain = rl_gain / normalize
+        @l_gain = l_gain / normalize
+        @lr_gain = lr_gain / normalize
       end
 
       def process(input)
         return input if @pan==0.0
 
-        input = input.stereo
-        src = input.streams
+        src = input.stereo.streams
         src0 = src[0]
         src1 = src[1]
 
-        output = Buffer.create_stereo(input.window_size)
-        dst = output.streams
-        dst0 = dst[0]
-        dst1 = dst[1]
-
-        input.window_size.times {|i|
-          l = (src0[i] * @l_gain + src1[i] * @lr_gain) / @normalize
-          r = (src1[i] * @r_gain + src0[i] * @rl_gain) / @normalize
-          dst0[i] = l
-          dst1[i] = r
-        }
-        output
+        dst0 = Vdsp::DoubleArray.new(src0.length)
+        Vdsp::UnsafeDouble.vsmsma(src0, 0, 1, @l_gain, src1, 0, 1, @lr_gain, dst0, 0, 1, src0.length)
+
+        dst1 = Vdsp::DoubleArray.new(src1.length)
+        Vdsp::UnsafeDouble.vsmsma(src0, 0, 1, @rl_gain, src1, 0, 1, @r_gain, dst1, 0, 1, src1.length)
+
+        Buffer.new(dst0, dst1)
       end
     end
   end

data/lib/audio_stream/fx/peaking_filter.rb

@@ -14,7 +14,10 @@ module AudioStream
         b1 = -2.0 * Math.cos(omega)
         b2 = 1.0 - alpha * a
 
-        @filter_coef = FilterCoef.new(a0, a1, a2, b0, b1, b2)
+        @coef = Vdsp::Biquad::Coefficient.new(b0/a0, b1/a0, b2/a0, a1/a0, a2/a0)
+        @biquads.each {|biquad|
+          biquad.coefficients = @coef
+        }
       end
 
       def self.create(soundinfo, freq:, bandwidth: 1.0, gain: 40.0)

data/lib/audio_stream/version.rb

@@ -1,3 +1,3 @@
 module AudioStream
-  VERSION = "2.0.0"
+  VERSION = "3.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: audio_stream
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-11 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: vdsp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: ruby-audio
   requirement: !ruby/object:Gem::Requirement