vdsp 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cd18e0b6e9eef27106756446b21cadd2e1cb8f2a2bfada08e4651aab9c6fd34
-  data.tar.gz: 6576aa464cdaaace4c13a6bab237c7dd36f2f057955527c995d723bb7ac86f6a
+  metadata.gz: fa99481dbf2b00907473c9af631b12bf886d7057eeec5522ed48aec918d21bfc
+  data.tar.gz: 93410ea00651167eb8fe11728cf47e24593cfb49c8c8220550165dfd0cea1c3f
 SHA512:
-  metadata.gz: c60da222d0d562ed6b093af5a07888bd528157c742c9402b0b9563c1061af21f1a9a5f0d34b39d084365348e9ff190b2590f6a80652bc247b4264dfba69354a1
-  data.tar.gz: 4747c95fc60e550c82590ff00a0fe2990ae095226cbb0ff298bab037fdf2b06aaf7d0502ade4d46092e4d1c2aab074df8b780a7c6df15800c6063e4eb1cd9924
+  metadata.gz: eb0e1248e5a7deedc29bccc11e2d038f36e16723015bae32f7123beb0831819722a5ab148de45af60416a21d6eee2be798ad049788e3373a669e26252e8f41e0
+  data.tar.gz: 21921f2e175eac1aa4818fce034d0e88310a4136a0f20d2002bf006df9cc1dd1a8e9106513ca8fa912445bed4956b3895f0639c89c011df09579dfb7d56313cd

data/ext/vdsp/vdsp.c

@@ -6,16 +6,18 @@ VALUE rb_mVdsp;
 VALUE rb_mVdspScalar;
 VALUE rb_mVdspArray;
 VALUE rb_mVdspBiquad;
+VALUE rb_mVdspFFT;
 
 VALUE rb_cDoubleScalar;
 VALUE rb_cDoubleArray;
 VALUE rb_mUnsafeDouble;
 VALUE rb_cDoubleBiquad;
+VALUE rb_cDoubleFFT;
 
 
 // Array native resource
 
-void vdsp_array_native_resource_delete(VdspArrayNativeResource * p)
+void vdsp_array_native_resource_delete(VdspArrayNativeResource *p)
 {
   if (p->v.ptr) {
     free(p->v.ptr);
@@ -32,7 +34,7 @@ VdspArrayNativeResource* get_vdsp_array_native_resource(VALUE va)
 
   VALUE resource = rb_iv_get(va, "native_resource");
   if (resource==Qnil) {
-    return NULL;
+    rb_raise(rb_eArgError, "Vdsp::Array has no native resource");
   }
 
   VdspArrayNativeResource *p;
@@ -59,7 +61,7 @@ void array_param2(VdspArrayParam *param, VALUE arr0, VALUE arr1, VALUE offset, V
 
 // Biquad native resource
 
-void vdsp_biquad_native_resource_delete(VdspBiquadNativeResource * p)
+void vdsp_biquad_native_resource_delete(VdspBiquadNativeResource *p)
 {
   if (p->setup.ptr) {
     if (p->type=='d') {
@@ -82,7 +84,7 @@ VdspBiquadNativeResource* get_vdsp_biquad_native_resource(VALUE vb)
 
   VALUE resource = rb_iv_get(vb, "native_resource");
   if (resource==Qnil) {
-    return NULL;
+    rb_raise(rb_eArgError, "Vdsp::Biquad has no native resource");
   }
 
   VdspBiquadNativeResource *p;
@@ -92,6 +94,36 @@ VdspBiquadNativeResource* get_vdsp_biquad_native_resource(VALUE vb)
 }
 
 
+// FFT native resource
+
+void vdsp_fft_native_resource_delete(VdspFFTNativeResource *p)
+{
+  if (p->setup.value) {
+    if (p->type=='d') {
+      vDSP_destroy_fftsetupD(p->setup.d);
+    }
+  }
+  free(p);
+}
+
+VdspFFTNativeResource* get_vdsp_fft_native_resource(VALUE vf)
+{
+  if (!rb_obj_is_kind_of(vf, rb_mVdspFFT)) {
+    rb_raise(rb_eArgError, "Vdsp::FFT required");
+  }
+
+  VALUE resource = rb_iv_get(vf, "native_resource");
+  if (resource==Qnil) {
+    rb_raise(rb_eArgError, "Vdsp::FFT has no native resource");
+  }
+
+  VdspFFTNativeResource *p;
+  Data_Get_Struct(resource, VdspFFTNativeResource, p);
+
+  return p;
+}
+
+
 // Vdsp::DoubleScalar
 
 VALUE rb_double_scalar_initialize(VALUE self, VALUE val)
@@ -635,6 +667,7 @@ VALUE rb_double_array_resize(VALUE self, VALUE size)
 VALUE rb_double_array_concat(int argc, const VALUE *argv, VALUE self)
 {
   rb_check_frozen(self);
+  rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
 
   VdspArrayNativeResource *_a = get_vdsp_array_native_resource(self);
   VdspArrayNativeResource *_argv[argc];
@@ -756,9 +789,7 @@ VALUE rb_double_array_vgen(VALUE cls, VALUE a, VALUE b, VALUE n)
 
 VALUE rb_double_array_blkman_window(int argc, const VALUE *argv, VALUE cls)
 {
-  if (argc<1 || 2<argc) {
-    rb_raise(rb_eArgError, "wrong number of arguments (given %d, expected 1..2)", argc);
-  }
+  rb_check_arity(argc, 1, 2);
   VALUE n = argv[0];
 
   vDSP_Length _n = NUM2LONG(n);
@@ -777,9 +808,7 @@ VALUE rb_double_array_blkman_window(int argc, const VALUE *argv, VALUE cls)
 
 VALUE rb_double_array_hamm_window(int argc, const VALUE *argv, VALUE cls)
 {
-  if (argc<1 || 2<argc) {
-    rb_raise(rb_eArgError, "wrong number of arguments (given %d, expected 1..2)", argc);
-  }
+  rb_check_arity(argc, 1, 2);
   VALUE n = argv[0];
 
   vDSP_Length _n = NUM2LONG(n);
@@ -798,9 +827,7 @@ VALUE rb_double_array_hamm_window(int argc, const VALUE *argv, VALUE cls)
 
 VALUE rb_double_array_hann_window(int argc, const VALUE *argv, VALUE cls)
 {
-  if (argc<1 || 2<argc) {
-    rb_raise(rb_eArgError, "wrong number of arguments (given %d, expected 1..2)", argc);
-  }
+  rb_check_arity(argc, 1, 2);
   VALUE n = argv[0];
 
   vDSP_Length _n = NUM2LONG(n);
@@ -1078,6 +1105,124 @@ VALUE rb_double_biquad_apply(VALUE self, VALUE x)
 }
 
 
+// Vdsp::DoubleFFT
+
+VALUE rb_double_fft_initialize(int argc, const VALUE *argv, VALUE self)
+{
+  rb_check_arity(argc, 1, 2);
+  long length = NUM2LONG(argv[0]);
+  FFTRadix radix = kFFTRadix2;
+  if (argc==2) {
+    radix = (FFTRadix)NUM2LONG(argv[1]);
+  }
+
+  VdspFFTNativeResource *p = ALLOC(VdspFFTNativeResource);
+  p->type = 'd';
+  p->length = 0;
+  p->log2n = 0;
+  p->radix = 0;
+  p->setup.value = NULL;
+
+  VALUE resource = Data_Wrap_Struct(CLASS_OF(self), 0, vdsp_fft_native_resource_delete, p);
+  rb_iv_set(self, "native_resource", resource);
+
+  p->length = length;
+  p->halflength = length / 2;
+  p->log2n = log2(length);
+  p->radix = radix;
+  p->setup.d = vDSP_create_fftsetupD(p->log2n, radix);
+
+  return self;
+}
+
+VALUE double_fft_forward1(VALUE fft, VALUE va)
+{
+  VdspFFTNativeResource *_vf = get_vdsp_fft_native_resource(fft);
+  VdspArrayNativeResource *_va = get_vdsp_array_native_resource(va);
+
+  if (_vf->length!=_va->length) {
+    rb_raise(rb_eArgError, "wrong length: Vdsp::FFT=%ld Vdsp::Array(real)=%ld", _vf->length, _va->length);
+  }
+
+  VALUE lenv = LONG2NUM(_vf->halflength);
+  VALUE real = rb_class_new_instance(1, &lenv, rb_cDoubleArray);
+  VALUE imag = rb_class_new_instance(1, &lenv, rb_cDoubleArray);
+  VdspArrayNativeResource *_real = get_vdsp_array_native_resource(real);
+  VdspArrayNativeResource *_imag = get_vdsp_array_native_resource(imag);
+
+  DSPDoubleSplitComplex z;
+  z.realp = _real->v.d;
+  z.imagp = _imag->v.d;
+
+  vDSP_ctozD((DSPDoubleComplex *)_va->v.d, 2, &z, 1, _vf->halflength);
+  vDSP_fft_zripD(_vf->setup.d, &z, 1, _vf->log2n, FFT_FORWARD);
+
+  double scale = 1.0 / (_vf->length * 2);
+  vDSP_vsmulD(z.realp, 1, &scale, z.realp, 1, _vf->halflength);
+  vDSP_vsmulD(z.imagp, 1, &scale, z.imagp, 1, _vf->halflength);
+
+  return rb_assoc_new(real, imag);
+}
+
+VALUE double_fft_forward2(VALUE fft, VALUE real, VALUE imag)
+{
+  VdspFFTNativeResource *_vf = get_vdsp_fft_native_resource(fft);
+  VdspArrayNativeResource *_real = get_vdsp_array_native_resource(real);
+  VdspArrayNativeResource *_imag = get_vdsp_array_native_resource(imag);
+
+  if (_vf->length!=_real->length || _real->length!=_imag->length) {
+    rb_raise(rb_eArgError, "wrong length: Vdsp::FFT=%ld Vdsp::Array(real)=%ld Vdsp::Array(imag)=%ld", _vf->length, _real->length, _imag->length);
+  }
+
+  real = rb_funcall(real, rb_intern("clone"), 0);
+  imag = rb_funcall(imag, rb_intern("clone"), 0);
+  _real = get_vdsp_array_native_resource(real);
+  _imag = get_vdsp_array_native_resource(imag);
+
+  DSPDoubleSplitComplex z;
+  z.realp = _real->v.d;
+  z.imagp = _imag->v.d;
+
+  vDSP_fft_zipD(_vf->setup.d, &z, 1, _vf->log2n, FFT_FORWARD);
+
+  double scale = 1.0 / _vf->length;
+  vDSP_vsmulD(z.realp, 1, &scale, z.realp, 1, _vf->length);
+  vDSP_vsmulD(z.imagp, 1, &scale, z.imagp, 1, _vf->length);
+
+  return rb_assoc_new(real, imag);
+}
+
+VALUE rb_double_fft_forward(int argc, const VALUE *argv, VALUE self)
+{
+  rb_check_arity(argc, 1, 2);
+  if (argc==2 && argv[1]!=Qnil) {
+    return double_fft_forward2(self, argv[0], argv[1]);
+  }
+  return double_fft_forward1(self, argv[0]);
+}
+
+VALUE rb_double_fft_spectrum(int argc, const VALUE *argv, VALUE self)
+{
+  VALUE ri = rb_double_fft_forward(argc, argv, self);
+  VALUE real = RARRAY_AREF(ri, 0);
+  VALUE imag = RARRAY_AREF(ri, 1);
+
+  VdspFFTNativeResource *_vf = get_vdsp_fft_native_resource(self);
+  VdspArrayNativeResource *_real = get_vdsp_array_native_resource(real);
+  VdspArrayNativeResource *_imag = get_vdsp_array_native_resource(imag);
+
+  VALUE lenv = LONG2NUM(_real->length);
+  VALUE mag = rb_class_new_instance(1, &lenv, rb_cDoubleArray);
+  VdspArrayNativeResource *_mag = get_vdsp_array_native_resource(mag);
+
+  // real**2 + imag**2
+  vDSP_vmulD(_real->v.d, 1, _real->v.d, 1, _mag->v.d, 1, _mag->length);
+  vDSP_vmaD(_imag->v.d, 1, _imag->v.d, 1, _mag->v.d, 1, _mag->v.d, 1, _mag->length);
+
+  return mag;
+}
+
+
 // Vdsp static method
 
 // c[i] = a[i]
@@ -1632,9 +1777,8 @@ VALUE rb_double_vsmsma(
 // e[i] = (a[i] + b[i]) * (c[i] + d[i])
 VALUE rb_double_vaam(int argc, const VALUE *argv, VALUE cls)
 {
-  if (argc!=16) {
-    rb_raise(rb_eArgError, "wrong number of arguments (given %d, expected 16)", argc);
-  }
+  rb_check_arity(argc, 16, 16);
+
   VALUE a = argv[0];
   VALUE a_offset = argv[1];
   VALUE a_stride = argv[2];
@@ -1680,9 +1824,8 @@ VALUE rb_double_vaam(int argc, const VALUE *argv, VALUE cls)
 // e[i] = (a[i] * b[i]) - (c[i] * d[i])
 VALUE rb_double_vmmsb(int argc, const VALUE *argv, VALUE cls)
 {
-  if (argc!=16) {
-    rb_raise(rb_eArgError, "wrong number of arguments (given %d, expected 16)", argc);
-  }
+  rb_check_arity(argc, 16, 16);
+
   VALUE a = argv[0];
   VALUE a_offset = argv[1];
   VALUE a_stride = argv[2];
@@ -1728,9 +1871,8 @@ VALUE rb_double_vmmsb(int argc, const VALUE *argv, VALUE cls)
 // e[i] = (a[i] - b[i]) * (c[i] - d[i])
 VALUE rb_double_vsbsbm(int argc, const VALUE *argv, VALUE cls)
 {
-  if (argc!=16) {
-    rb_raise(rb_eArgError, "wrong number of arguments (given %d, expected 16)", argc);
-  }
+  rb_check_arity(argc, 16, 16);
+
   VALUE a = argv[0];
   VALUE a_offset = argv[1];
   VALUE a_stride = argv[2];
@@ -1776,9 +1918,8 @@ VALUE rb_double_vsbsbm(int argc, const VALUE *argv, VALUE cls)
 // e[i] = (a[i] + b[i]) * (c[i] - d[i])
 VALUE rb_double_vasbm(int argc, const VALUE *argv, VALUE cls)
 {
-  if (argc!=16) {
-    rb_raise(rb_eArgError, "wrong number of arguments (given %d, expected 16)", argc);
-  }
+  rb_check_arity(argc, 16, 16);
+
   VALUE a = argv[0];
   VALUE a_offset = argv[1];
   VALUE a_stride = argv[2];
@@ -2426,7 +2567,7 @@ VALUE rb_double_vswap(
     _n
   );
 
-  return rb_ary_new3(2, a, b);
+  return rb_assoc_new(a, b);
 }
 
 VALUE rb_double_vtmerg(
@@ -2831,6 +2972,19 @@ void Init_vdsp()
   rb_define_method(rb_cDoubleBiquad, "coefficients", rb_double_biquad_get_coefficients, 0);
   rb_define_method(rb_cDoubleBiquad, "apply", rb_double_biquad_apply, 1);
 
+  // Vdsp::FFT
+  rb_mVdspFFT = rb_define_module_under(rb_mVdsp, "FFT");
+  rb_define_const(rb_mVdspFFT, "Radix2", LONG2NUM(kFFTRadix2));
+  rb_define_const(rb_mVdspFFT, "Radix3", LONG2NUM(kFFTRadix3));
+  rb_define_const(rb_mVdspFFT, "Radix5", LONG2NUM(kFFTRadix5));
+
+  // Vdsp::DoubleFFT
+  rb_cDoubleFFT = rb_define_class_under(rb_mVdsp, "DoubleFFT", rb_cObject);
+  rb_include_module(rb_cDoubleFFT, rb_mVdspFFT);
+  rb_define_method(rb_cDoubleFFT, "initialize", rb_double_fft_initialize, -1);
+  rb_define_method(rb_cDoubleFFT, "forward", rb_double_fft_forward, -1);
+  rb_define_method(rb_cDoubleFFT, "spectrum", rb_double_fft_spectrum, -1);
+
   // Vdsp::UnsafeDouble
   rb_mUnsafeDouble = rb_define_module_under(rb_mVdsp, "UnsafeDouble");
   rb_define_singleton_method(rb_mUnsafeDouble, "copy", rb_double_copy, 7);

data/ext/vdsp/vdsp.h

@@ -45,6 +45,23 @@ typedef struct {
 } VdspBiquadNativeResource;
 
 
+// VdspFFT
+
+typedef union {
+  void *value;
+  FFTSetupD d;
+} VdspFFTSetup;
+
+typedef struct {
+  char type;
+  VdspFFTSetup setup;
+  unsigned long length;
+  unsigned long halflength;
+  vDSP_Length log2n;
+  FFTRadix radix;
+} VdspFFTNativeResource;
+
+
 extern VALUE rb_double_array_plus(VALUE self, VALUE other);
 extern VALUE rb_double_array_mul(VALUE self, VALUE other);
 extern void double_array_resize(VdspArrayNativeResource *_a, unsigned long len);

data/lib/vdsp/version.rb

@@ -1,3 +1,3 @@
 module Vdsp
-  VERSION = "1.10.0"
+  VERSION = "1.11.0"
 end

data/lib/vdsp.rb

@@ -5,6 +5,23 @@ module Vdsp
   class Error < StandardError; end
   # Your code goes here...
 
+  module Array
+    def blkman_window(flag=FULL_WINDOW)
+      window = self.class.blkman_window(self.length, flag)
+      self * window
+    end
+
+    def hamm_window(flag=FULL_WINDOW)
+      window = self.class.hamm_window(self.length, flag)
+      self * window
+    end
+
+    def hann_window(flag=FULL_WINDOW)
+      window = self.class.hann_window(self.length, flag)
+      self * window
+    end
+  end
+
   module Biquad
     Coefficient = Struct.new("Coefficient", :b0, :b1, :b2, :a1, :a2)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vdsp
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2019-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler