vdsp 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f53e044e333e5757fde388054223a280d2fe15ac5ec165ae8cb5d1145b4751ff
-  data.tar.gz: 245581561fbf5ef0083f4596629a732e14f6cc49b7e72901d386a543c6e331e4
+  metadata.gz: a5d8f8b6a88c276a1379130a5714a2021405272cce868a929dc298e8fe53ffcd
+  data.tar.gz: a2519330af53222ed133f6acdf0b4d5fde5cdfe451a0d61f662a3d2c99db8405
 SHA512:
-  metadata.gz: e236a62a90d732d8e399acef737fafbeca4621d4f2a5cfc0a4cdd365ad0dc5ace6910b94aa4db03a743554f5a34434a9f53f615eb98aa13a7c3c3a79a299e61a
-  data.tar.gz: 8003b2c57bc0a67849dd5a005fe376d89bc094afe13a8911a2e05f21f72fcb17decd8a16d5479cb8d749048ca89d05521713220a3d98b7d9777874e11523b596
+  metadata.gz: 6557320864d0952107d09d705fd19fd1584e78cabacbada432b941a474de14ef0847cfaf5ffa7d468a1a4f8e678c63c74146222c8541562c5912cc7859cf1247
+  data.tar.gz: f346a56cca2958994da7d367bbfc788fb9a6aba0409e8475a4159af149ce0b80fa0f69dae7bb77162ea2c123d4fe179c4ec1af28d1b9d6d0d9e7b7061f1a7930

data/ext/vdsp/vdsp.c

@@ -5,18 +5,21 @@ VALUE rb_mVdsp;
 
 VALUE rb_mVdspScalar;
 VALUE rb_mVdspArray;
+VALUE rb_mVdspBiquad;
 
 VALUE rb_cDoubleScalar;
 VALUE rb_cDoubleArray;
 VALUE rb_mUnsafeDouble;
+VALUE rb_cDoubleBiquad;
 
 
-// Native resource
+// Array native resource
 
 void vdsp_array_native_resource_delete(VdspArrayNativeResource * p)
 {
   if (p->v.ptr) {
     free(p->v.ptr);
+    p->v.ptr = NULL;
   }
   free(p);
 }
@@ -38,23 +41,6 @@ VdspArrayNativeResource* get_vdsp_array_native_resource(VALUE va)
   return p;
 }
 
-VdspArrayValue get_vdsp_array_value(VALUE va)
-{
-  VdspArrayNativeResource *p = get_vdsp_array_native_resource(va);
-  return p->v;
-}
-
-double* get_double_array_value(VALUE va)
-{
-  return get_vdsp_array_value(va).d;
-}
-
-long get_vdsp_array_length(VALUE va)
-{
-  VdspArrayNativeResource *_a = get_vdsp_array_native_resource(va);
-  return _a->length;
-}
-
 void array_param(VdspArrayParam *param, VALUE arr0, VALUE offset, VALUE stride)
 {
   param->res0 = get_vdsp_array_native_resource(arr0);
@@ -71,6 +57,54 @@ void array_param2(VdspArrayParam *param, VALUE arr0, VALUE arr1, VALUE offset, V
 }
 
 
+// Biquad native resource
+
+void vdsp_biquad_native_resource_delete(VdspBiquadNativeResource * p)
+{
+  if (p->setup.ptr) {
+    if (p->type=='d') {
+      vDSP_biquad_DestroySetupD(p->setup.d);
+      p->setup.ptr = NULL;
+    }
+  }
+  if (p->delay.ptr) {
+    free(p->delay.ptr);
+    p->delay.ptr = NULL;
+  }
+  free(p);
+}
+
+VdspBiquadNativeResource* get_vdsp_biquad_native_resource(VALUE vb)
+{
+  if (!rb_obj_is_kind_of(vb, rb_mVdspBiquad)) {
+    rb_raise(rb_eArgError, "Vdsp::Biquad required");
+  }
+
+  VALUE resource = rb_iv_get(vb, "native_resource");
+  if (resource==Qnil) {
+    return NULL;
+  }
+
+  VdspBiquadNativeResource *p;
+  Data_Get_Struct(resource, VdspBiquadNativeResource, p);
+
+  return p;
+}
+
+VdspBiquadSetup get_vdsp_biquad_setup(VALUE vb)
+{
+  VdspBiquadNativeResource *p = get_vdsp_biquad_native_resource(vb);
+  return p->setup;
+}
+
+long get_vdsp_biquad_sections(VALUE vb)
+{
+  VdspBiquadNativeResource *_b = get_vdsp_biquad_native_resource(vb);
+  return _b->sections;
+}
+
+
+
 // Vdsp::DoubleScalar
 
 VALUE rb_double_scalar_initialize(VALUE self, VALUE val)
@@ -128,7 +162,8 @@ VALUE rb_double_scalar_div(VALUE self, VALUE other)
 
 VALUE rb_vdsp_array_length(VALUE self)
 {
-  return LONG2NUM(get_vdsp_array_length(self));
+  VdspArrayNativeResource *p = get_vdsp_array_native_resource(self);
+  return LONG2NUM(p->length);
 }
 
 
@@ -621,6 +656,97 @@ VALUE rb_double_array_svs(VALUE self)
 }
 
 
+// Vdsp::Biquad
+
+VALUE rb_vdsp_biquad_sections(VALUE self)
+{
+  return LONG2NUM(get_vdsp_biquad_sections(self));
+}
+
+
+// Vdsp::DoubleBiquad
+
+VALUE rb_double_biquad_initialize(VALUE self, VALUE coefficients)
+{
+  coefficients = rb_ary_new3(1, coefficients);
+  coefficients = rb_funcall(coefficients, rb_intern("flatten"), 0);
+
+  VALUE rb_cBiquadCoefficient = rb_const_get(rb_mVdspBiquad, rb_intern("Coefficient"));
+
+  long sections = RARRAY_LEN(coefficients);
+  for (long i=0; i<sections; i++) {
+    VALUE coefficient = RARRAY_AREF(coefficients, i);
+    if (!rb_obj_is_kind_of(coefficient, rb_cBiquadCoefficient)) {
+      rb_raise(rb_eArgError, "Vdsp::Biquad::Coefficient required");
+    }
+  }
+
+  VdspBiquadNativeResource *p = ALLOC(VdspBiquadNativeResource);
+  p->type = 'd';
+  p->coefs.ptr = NULL;
+  p->delay.ptr = NULL;
+  p->setup.ptr = NULL;
+  p->sections = 0;
+
+  VALUE resource = Data_Wrap_Struct(CLASS_OF(self), 0, vdsp_biquad_native_resource_delete, p);
+  rb_iv_set(self, "native_resource", resource);
+
+  p->coefs.ptr = calloc(sections*5, sizeof(double));
+  for (long i=0; i<sections; i++) {
+    VALUE coefficient = RARRAY_AREF(coefficients, i);
+    p->coefs.d[i*5+0] = NUM2DBL(rb_funcall(coefficient, rb_intern("b0"), 0));
+    p->coefs.d[i*5+1] = NUM2DBL(rb_funcall(coefficient, rb_intern("b1"), 0));
+    p->coefs.d[i*5+2] = NUM2DBL(rb_funcall(coefficient, rb_intern("b2"), 0));
+    p->coefs.d[i*5+3] = NUM2DBL(rb_funcall(coefficient, rb_intern("a1"), 0));
+    p->coefs.d[i*5+4] = NUM2DBL(rb_funcall(coefficient, rb_intern("a2"), 0));
+  }
+  p->delay.ptr = calloc(sections*2+2, sizeof(double));
+  p->setup.d = vDSP_biquad_CreateSetupD(p->coefs.d, sections);
+  p->sections = sections;
+
+  return self;
+}
+
+VALUE rb_double_biquad_apply(VALUE self, VALUE x)
+{
+  //x = rb_funcall(x, rb_intern("to_da"), 0);
+  x = rb_funcall(rb_cDoubleArray, rb_intern("create"), 1, x);
+  VdspArrayNativeResource *_x = get_vdsp_array_native_resource(x);
+
+  VALUE lenv = LONG2NUM(_x->length);
+  VALUE y = rb_class_new_instance(1, &lenv, rb_cDoubleArray);
+  VdspArrayNativeResource *_y = get_vdsp_array_native_resource(y);
+
+  VdspBiquadNativeResource *_b = get_vdsp_biquad_native_resource(self);
+
+  vDSP_biquadD(_b->setup.d, _b->delay.d, _x->v.d, 1, _y->v.d, 1, _x->length);
+
+  return y;
+}
+
+VALUE rb_double_biquad_coefficients(VALUE self)
+{
+  VdspBiquadNativeResource *p = get_vdsp_biquad_native_resource(self);
+  VALUE ret = rb_ary_new2(p->sections);
+
+  VALUE rb_cBiquadCoefficient = rb_const_get(rb_mVdspBiquad, rb_intern("Coefficient"));
+
+  for (unsigned long i=0; i<p->sections; i++) {
+    VALUE argv[5] = {
+      DBL2NUM(p->coefs.d[i*5+0]),
+      DBL2NUM(p->coefs.d[i*5+1]),
+      DBL2NUM(p->coefs.d[i*5+2]),
+      DBL2NUM(p->coefs.d[i*5+3]),
+      DBL2NUM(p->coefs.d[i*5+4])
+    };
+    VALUE coef = rb_class_new_instance(5, argv, rb_cBiquadCoefficient);
+    rb_ary_push(ret, coef);
+  }
+
+  return ret;
+}
+
+
 // Vdsp static method
 
 // c[i] = a[i] + b
@@ -1921,6 +2047,31 @@ VALUE rb_double_svs(
   return DBL2NUM(_c);
 }
 
+VALUE rb_double_biquad(
+  VALUE cls,
+  VALUE biquad,
+  VALUE x, VALUE x_offset, VALUE x_stride,
+  VALUE y, VALUE y_offset, VALUE y_stride,
+  VALUE n)
+{
+  VdspArrayParam _x;
+  VdspArrayParam _y;
+
+  VdspBiquadNativeResource *_b = get_vdsp_biquad_native_resource(biquad);
+  array_param(&_x, x, x_offset, x_stride);
+  array_param(&_y, y, y_offset, y_stride);
+  vDSP_Stride _n = NUM2LONG(n);
+
+  vDSP_biquadD(
+    _b->setup.d,
+    _b->delay.d,
+    _x.res0->v.d+_x.offset, _x.stride,
+    _y.res0->v.d+_y.offset, _y.stride,
+    _n);
+
+  return y;
+}
+
 
 // Init
 
@@ -1997,6 +2148,17 @@ void Init_vdsp()
   rb_define_method(rb_cDoubleArray, "sve_svesq", rb_double_array_sve_svesq, 0);
   rb_define_method(rb_cDoubleArray, "svs", rb_double_array_svs, 0);
 
+  // Vdsp::Biquad
+  rb_mVdspBiquad = rb_define_module_under(rb_mVdsp, "Biquad");
+  rb_define_method(rb_mVdspBiquad, "sections", rb_vdsp_biquad_sections, 0);
+
+  // Vdsp::DoubleBiquad
+  rb_cDoubleBiquad = rb_define_class_under(rb_mVdsp, "DoubleBiquad", rb_cObject);
+  rb_include_module(rb_cDoubleBiquad, rb_mVdspBiquad);
+  rb_define_method(rb_cDoubleBiquad, "initialize", rb_double_biquad_initialize, 1);
+  rb_define_method(rb_cDoubleBiquad, "apply", rb_double_biquad_apply, 1);
+  rb_define_method(rb_cDoubleBiquad, "coefficients", rb_double_biquad_coefficients, 0);
+
   // Vdsp::UnsafeDouble
   rb_mUnsafeDouble = rb_define_module_under(rb_mVdsp, "UnsafeDouble");
 
@@ -2060,4 +2222,7 @@ void Init_vdsp()
   rb_define_singleton_method(rb_mUnsafeDouble, "svesq", rb_double_svesq, 4);
   rb_define_singleton_method(rb_mUnsafeDouble, "sve_svesq", rb_double_sve_svesq, 4);
   rb_define_singleton_method(rb_mUnsafeDouble, "svs", rb_double_svs, 4);
+
+  // Vdsp::UnsafeDouble Biquadratic IIR Filters
+  rb_define_singleton_method(rb_mUnsafeDouble, "biquad", rb_double_biquad, 8);
 }

data/ext/vdsp/vdsp.h

@@ -1,6 +1,9 @@
 #include <ruby.h>
 #include <Accelerate/Accelerate.h>
 
+
+// VdspArray
+
 typedef union {
   void *ptr;
   double *d;
@@ -18,6 +21,29 @@ typedef struct {
   vDSP_Stride stride;
 } VdspArrayParam;
 
+
+// VdspBiquad
+
+typedef union {
+  void *ptr;
+  struct vDSP_biquad_SetupStructD *d;
+} VdspBiquadSetup;
+
+typedef struct {
+  char type;
+  union {
+    void *ptr;
+    double *d;
+  } coefs;
+  union {
+    void *ptr;
+    double *d;
+  } delay;
+  VdspBiquadSetup setup;
+  unsigned long sections;
+} VdspBiquadNativeResource;
+
+
 extern VALUE rb_double_array_plus(VALUE self, VALUE other);
 extern VALUE rb_double_array_mul(VALUE self, VALUE other);
 

data/lib/vdsp.rb

@@ -4,4 +4,8 @@ require "vdsp/vdsp"
 module Vdsp
   class Error < StandardError; end
   # Your code goes here...
+
+  module Biquad
+    Coefficient = Struct.new("Coefficient", :b0, :b1, :b2, :a1, :a2)
+  end
 end

data/lib/vdsp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vdsp
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - yoshida
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-21 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler