vdsp 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa99481dbf2b00907473c9af631b12bf886d7057eeec5522ed48aec918d21bfc
-  data.tar.gz: 93410ea00651167eb8fe11728cf47e24593cfb49c8c8220550165dfd0cea1c3f
+  metadata.gz: a957ab0300b98fe324433a6ce9c6df4a7675fb9a0236121277cf9108f4296afa
+  data.tar.gz: f5496fd85f20e5101453cf42bd290c58d7d13b5cb1fde34bad41c53bc7901285
 SHA512:
-  metadata.gz: eb0e1248e5a7deedc29bccc11e2d038f36e16723015bae32f7123beb0831819722a5ab148de45af60416a21d6eee2be798ad049788e3373a669e26252e8f41e0
-  data.tar.gz: 21921f2e175eac1aa4818fce034d0e88310a4136a0f20d2002bf006df9cc1dd1a8e9106513ca8fa912445bed4956b3895f0639c89c011df09579dfb7d56313cd
+  metadata.gz: 150786ad2737a6fd5eb949c0a8e1aeea96650f051463bc21d70f92770b5694947db0067b6b2cf865331d3a0590be99767729418b0a64b05f5f0fd1ad81591b11
+  data.tar.gz: 250b4b1ebce4641842d2b683695bab52c4c4db062a4358b8ea1aa81d0d500ae41f080c936d8434872b83670a551644774de2d5f61b7e1f072fb9ad548fb5791e

data/ext/vdsp/vdsp.c

@@ -1135,7 +1135,7 @@ VALUE rb_double_fft_initialize(int argc, const VALUE *argv, VALUE self)
   return self;
 }
 
-VALUE double_fft_forward1(VALUE fft, VALUE va)
+VALUE double_fft_forward_r(VALUE fft, VALUE va)
 {
   VdspFFTNativeResource *_vf = get_vdsp_fft_native_resource(fft);
   VdspArrayNativeResource *_va = get_vdsp_array_native_resource(va);
@@ -1164,7 +1164,7 @@ VALUE double_fft_forward1(VALUE fft, VALUE va)
   return rb_assoc_new(real, imag);
 }
 
-VALUE double_fft_forward2(VALUE fft, VALUE real, VALUE imag)
+VALUE double_fft_forward_z(VALUE fft, VALUE real, VALUE imag)
 {
   VdspFFTNativeResource *_vf = get_vdsp_fft_native_resource(fft);
   VdspArrayNativeResource *_real = get_vdsp_array_native_resource(real);
@@ -1196,9 +1196,68 @@ 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_forward_z(self, argv[0], argv[1]);
+  }
+  return double_fft_forward_r(self, argv[0]);
+}
+
+VALUE double_fft_inverse_r(VALUE fft, VALUE real, VALUE imag)
+{
+  real = rb_funcall(real, rb_intern("clone"), 0);
+  imag = rb_funcall(imag, rb_intern("clone"), 0);
+
+  VdspFFTNativeResource *_vf = get_vdsp_fft_native_resource(fft);
+  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_fft_zripD(_vf->setup.d, &z, 1, _vf->log2n, FFT_INVERSE);
+
+  VALUE lenv = LONG2NUM(_vf->length);
+  VALUE inverse = rb_class_new_instance(1, &lenv, rb_cDoubleArray);
+  VdspArrayNativeResource *_inverse = get_vdsp_array_native_resource(inverse);
+
+  vDSP_ztocD(&z, 1, (DSPDoubleComplex *)_inverse->v.d, 2, _vf->halflength);
+
+  return rb_assoc_new(inverse, Qnil);
+}
+
+VALUE double_fft_inverse_z(VALUE fft, VALUE real, VALUE imag)
+{
+  real = rb_funcall(real, rb_intern("clone"), 0);
+  imag = rb_funcall(imag, rb_intern("clone"), 0);
+
+  VdspFFTNativeResource *_vf = get_vdsp_fft_native_resource(fft);
+  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_fft_zipD(_vf->setup.d, &z, 1, _vf->log2n, FFT_INVERSE);
+
+  return rb_assoc_new(real, imag);
+}
+
+VALUE rb_double_fft_inverse(VALUE self, VALUE real, VALUE imag)
+{
+  VdspFFTNativeResource *_vf = get_vdsp_fft_native_resource(self);
+  VdspArrayNativeResource *_real = get_vdsp_array_native_resource(real);
+  VdspArrayNativeResource *_imag = get_vdsp_array_native_resource(imag);
+
+  if (_vf->length==_real->length) {
+    return double_fft_inverse_z(self, real, imag);
+
+  } else if (_vf->halflength==_real->length) {
+    return double_fft_inverse_r(self, real, imag);
+
+  } else {
+    rb_raise(rb_eArgError, "wrong length: Vdsp::FFT=%ld Vdsp::Array(real)=%ld Vdsp::Array(imag)=%ld", _vf->length, _real->length, _imag->length);
   }
-  return double_fft_forward1(self, argv[0]);
 }
 
 VALUE rb_double_fft_spectrum(int argc, const VALUE *argv, VALUE self)
@@ -1207,19 +1266,42 @@ VALUE rb_double_fft_spectrum(int argc, const VALUE *argv, VALUE 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);
+  DSPDoubleSplitComplex z;
+  z.realp = _real->v.d;
+  z.imagp = _imag->v.d;
+
+  VALUE lenv = LONG2NUM(_real->length*2);
+  VALUE tmp = rb_class_new_instance(1, &lenv, rb_cDoubleArray);
+  VdspArrayNativeResource *_tmp = get_vdsp_array_native_resource(tmp);
+
+  vDSP_ztocD(&z, 1, (DSPDoubleComplex *)_tmp->v.d, 2, _real->length);
+  vDSP_polarD(_tmp->v.d, 2, _tmp->v.d, 2, _real->length);
+  vDSP_ctozD((DSPDoubleComplex *)_tmp->v.d, 2, &z, 1, _real->length);
+
+  return rb_assoc_new(real, imag);
+}
+
+VALUE rb_double_fft_inverse_spectrum(VALUE self, VALUE mag, VALUE pha)
+{
   VdspArrayNativeResource *_mag = get_vdsp_array_native_resource(mag);
+  VdspArrayNativeResource *_pha = get_vdsp_array_native_resource(pha);
+
+  DSPDoubleSplitComplex z;
+  z.realp = _mag->v.d;
+  z.imagp = _pha->v.d;
+
+  VALUE lenv = LONG2NUM(_mag->length*2);
+  VALUE tmp = rb_class_new_instance(1, &lenv, rb_cDoubleArray);
+  VdspArrayNativeResource *_tmp = get_vdsp_array_native_resource(tmp);
 
-  // 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);
+  vDSP_ztocD(&z, 1, (DSPDoubleComplex *)_tmp->v.d, 2, _mag->length);
+  vDSP_rectD(_tmp->v.d, 2, _tmp->v.d, 2, _mag->length);
+  vDSP_ctozD((DSPDoubleComplex *)_tmp->v.d, 2, &z, 1, _mag->length);
 
-  return mag;
+  return rb_double_fft_inverse(self, mag, pha);
 }
 
 
@@ -2983,7 +3065,9 @@ void Init_vdsp()
   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, "inverse", rb_double_fft_inverse, 2);
   rb_define_method(rb_cDoubleFFT, "spectrum", rb_double_fft_spectrum, -1);
+  rb_define_method(rb_cDoubleFFT, "inverse_spectrum", rb_double_fft_inverse_spectrum, 2);
 
   // Vdsp::UnsafeDouble
   rb_mUnsafeDouble = rb_define_module_under(rb_mVdsp, "UnsafeDouble");

data/lib/vdsp/version.rb

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

metadata

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