vdsp 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5d8f8b6a88c276a1379130a5714a2021405272cce868a929dc298e8fe53ffcd
-  data.tar.gz: a2519330af53222ed133f6acdf0b4d5fde5cdfe451a0d61f662a3d2c99db8405
+  metadata.gz: 2358672ca07fa482ca8592ac9e49d9c4eca38b7bc2b7d3a137765032fdf4cc8b
+  data.tar.gz: 9bc65fad63980a3fb482092feea369f89907870c46f30309cbe332f3bdf99744
 SHA512:
-  metadata.gz: 6557320864d0952107d09d705fd19fd1584e78cabacbada432b941a474de14ef0847cfaf5ffa7d468a1a4f8e678c63c74146222c8541562c5912cc7859cf1247
-  data.tar.gz: f346a56cca2958994da7d367bbfc788fb9a6aba0409e8475a4159af149ce0b80fa0f69dae7bb77162ea2c123d4fe179c4ec1af28d1b9d6d0d9e7b7061f1a7930
+  metadata.gz: 1bf33f3a43ffcabf3407daec1184b21253085e0d1bbf665c4206546f2612ca0b8ab5e3f186c594931102d704c1475da74372efb3d6f86c171a8f3ed1a81a99a0
+  data.tar.gz: d784d6291d25137935380e3bb719ae530482c785b471d2be91b97fe51fa2868695eb0b7b51383d8b03a2389fa1e6c1262c4f149a776d3bc7660aa77696c609e0

data/ext/vdsp/vdsp.c

@@ -91,19 +91,6 @@ VdspBiquadNativeResource* get_vdsp_biquad_native_resource(VALUE vb)
   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
 
@@ -660,39 +647,65 @@ VALUE rb_double_array_svs(VALUE self)
 
 VALUE rb_vdsp_biquad_sections(VALUE self)
 {
-  return LONG2NUM(get_vdsp_biquad_sections(self));
+  VdspBiquadNativeResource *p = get_vdsp_biquad_native_resource(self);
+  return LONG2NUM(p->sections);
+}
+
+VALUE rb_vdsp_biquad_alloc_sections(VALUE self)
+{
+  VdspBiquadNativeResource *p = get_vdsp_biquad_native_resource(self);
+  return LONG2NUM(p->alloc_sections);
 }
 
 
 // Vdsp::DoubleBiquad
 
-VALUE rb_double_biquad_initialize(VALUE self, VALUE coefficients)
+VALUE rb_double_biquad_initialize(VALUE self, VALUE alloc_sections)
 {
+  VdspBiquadNativeResource *p = ALLOC(VdspBiquadNativeResource);
+  p->type = 'd';
+  p->coefs.ptr = NULL;
+  p->delay.ptr = NULL;
+  p->setup.ptr = NULL;
+  p->sections = 0;
+  p->alloc_sections = 0;
+
+  VALUE resource = Data_Wrap_Struct(CLASS_OF(self), 0, vdsp_biquad_native_resource_delete, p);
+  rb_iv_set(self, "native_resource", resource);
+
+  long _alloc_sections = NUM2LONG(alloc_sections);
+  if (_alloc_sections<1) {
+    _alloc_sections = 1;
+  }
+  p->coefs.ptr = calloc(_alloc_sections*5, sizeof(double));
+  p->delay.ptr = calloc(_alloc_sections*2+2, sizeof(double));
+  p->alloc_sections = _alloc_sections;
+
+  return self;
+}
+
+VALUE rb_double_biquad_set_coefficients(VALUE self, VALUE coefficients)
+{
+  VdspBiquadNativeResource *p = get_vdsp_biquad_native_resource(self);
+
   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++) {
+  unsigned long sections = RARRAY_LEN(coefficients);
+  if (p->alloc_sections<sections) {
+    rb_raise(rb_eArgError, "over sections: sections=%ld alloc_sections=%ld", sections, p->alloc_sections);
+  }
+
+  for (unsigned 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++) {
+  for (unsigned 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));
@@ -700,31 +713,17 @@ VALUE rb_double_biquad_initialize(VALUE self, VALUE coefficients)
     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));
+
+  if (p->setup.d) {
+    vDSP_biquad_DestroySetupD(p->setup.d);
+  }
   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)
+VALUE rb_double_biquad_get_coefficients(VALUE self)
 {
   VdspBiquadNativeResource *p = get_vdsp_biquad_native_resource(self);
   VALUE ret = rb_ary_new2(p->sections);
@@ -746,6 +745,35 @@ VALUE rb_double_biquad_coefficients(VALUE self)
   return ret;
 }
 
+VALUE rb_double_biquad_create(VALUE cls, VALUE coefficients)
+{
+  coefficients = rb_ary_new3(1, coefficients);
+  coefficients = rb_funcall(coefficients, rb_intern("flatten"), 0);
+
+  VALUE len = LONG2NUM(RARRAY_LEN(coefficients));
+  VALUE obj = rb_class_new_instance(1, &len, rb_cDoubleBiquad);
+  rb_double_biquad_set_coefficients(obj, coefficients);
+
+  return obj;
+}
+
+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;
+}
+
 
 // Vdsp static method
 
@@ -2151,13 +2179,16 @@ void Init_vdsp()
   // Vdsp::Biquad
   rb_mVdspBiquad = rb_define_module_under(rb_mVdsp, "Biquad");
   rb_define_method(rb_mVdspBiquad, "sections", rb_vdsp_biquad_sections, 0);
+  rb_define_method(rb_mVdspBiquad, "alloc_sections", rb_vdsp_biquad_alloc_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_singleton_method(rb_cDoubleBiquad, "create", rb_double_biquad_create, 1);
+  rb_define_method(rb_cDoubleBiquad, "coefficients=", rb_double_biquad_set_coefficients, 1);
+  rb_define_method(rb_cDoubleBiquad, "coefficients", rb_double_biquad_get_coefficients, 0);
   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");

data/ext/vdsp/vdsp.h

@@ -41,6 +41,7 @@ typedef struct {
   } delay;
   VdspBiquadSetup setup;
   unsigned long sections;
+  unsigned long alloc_sections;
 } VdspBiquadNativeResource;
 
 

data/lib/vdsp/version.rb

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

data/vdsp.gemspec

@@ -5,7 +5,7 @@ require "vdsp/version"
 Gem::Specification.new do |spec|
   spec.name          = "vdsp"
   spec.version       = Vdsp::VERSION
-  spec.authors       = ["yoshida"]
+  spec.authors       = ["Yoshida Tetsuya"]
   spec.email         = ["yoshida.eth0@gmail.com"]
 
   spec.summary       = %q{Perform basic arithmetic operations and common digital signal processing routines on large vectors.}

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: vdsp
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
-- yoshida
+- Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []