wavspa 0.3.2 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3625b56c19b4e498a53f7315d2439d4c7f4f75c77b46c7d155b35f4e4cc792c4
-  data.tar.gz: c557a8053812bc666cd5d4a9345442ce297d5fb79b7e12aaf0e28af6aecd5a38
+  metadata.gz: 844dc6500de04cf1cd5f297fa6a979dd4c233f5e203e135865e1e810537a0666
+  data.tar.gz: 892077f9f61abf70463c16c70c29f33063f14ae691e2c42c98552240280aa9b3
 SHA512:
-  metadata.gz: c26524dacf4725c2032d5e4ce99eef6c24f52a0fc10416918524e7ace1393a53de44905763b51684c8675b7524e66e28a660c2e22669a36ef9b4ce78ed930467
-  data.tar.gz: fe5a7dbdebd6bf3f41a73f9f0076161794304567326592bcc67eabe4bc012f248edede2066ede39b954f7684304a8a99a6ba1d620b7afc567af526e354a633ce
+  metadata.gz: cc99f998f7065d64d86fefdcfd22f6053b126ff28e87178fc7f92828ca36a3d55b7d445c33099ed2301d441f696cb7a646fe00d3935a812865fda08640b073a3
+  data.tar.gz: b69d4f4e2ec12b78e57893d5a2dfa0e7a8abe4173a914ce081b26a15e950ae5dee7153cb1f5ed96ab56f309c003f783408c0afa550f50e531af6f1442de2c92d

data/README.md

@@ -40,6 +40,7 @@ options:
     -r, --frequency-range=LO,HI
         --floor-gain=DB
         --ceil-gain=DB
+        --luminance=NUMBER
     -g, --frequency-grid=BASIS,STEP
     -m, --scale-mode=MODE
     -c, --col-steps=SIZE
@@ -83,6 +84,9 @@ options:
   <dt>--ceil-gain=DB</dt>
   <dd>specify the lower limit value of the gain to be displayed. values less than this number will be masked. effective only for amplitude mode.</dd>
 
+  <dt>--luminance=NUMBER</dt>
+  <dd>specify correction value of luminance for pixel drawing (default is 3.5). effective only for power spectrum mode.</dd>
+
   <dt>-g, --frequency-grid=BASIS,STEP</dt>
   <dd>specify frequency grid settings. basis frequency to "BASIS" and step value to "STEP".  "STEP" is evaluated as a ratio for neighbor grid when the scale mode is LOGSCALE, and as a difference for neighbor grid when LINEARSCALE.</dd>
 
@@ -123,6 +127,7 @@ options:
     -r, --frequency-range=LO,HI
         --floor-gain=DB
         --ceil-gain=DB
+        --luminance=NUMBER
     -g, --frequnecy-grid=BASIS,STEP
     -m, --scale-mode=STRING
     -c, --col-steps=SIZE
@@ -156,14 +161,15 @@ options:
 
   <dt>--floor-gain=DB</dt>
   <dd>specify the upper limit value of the gain to be displayed. values exceeding this number are displayed as saturated. effective only for amplitude mode.</dd>
-
   <dt>--ceil-gain=DB</dt>
   <dd>specify the lower limit value of the gain to be displayed. values less than this number will be masked. effective only for amplitude mode.</dd>
 
+  <dt>--luminance=NUMBER</dt>
+  <dd>specify correction value of luminance for pixel drawing (default is 3.5). effective only for power spectrum mode.</dd>
+
   <dt>-g, --frequency-grid=BASIS,STEP</dt>
   <dd>specify frequency grid settings. basis frequency to "BASIS" and step value to "STEP".  "STEP" is evaluated as a ratio for neighbor grid when the scale mode is LOGSCALE, and as a difference for neighbor grid when LINEARSCALE.</dd>
 
-
   <dt>-m, --scale=mode</dt>
   <dd>specify the mode of grid scale in vertical direction of th output PNG. you can specify one of "LOGSCALE" or "LINEARSCALE" (default is "LOGSCALE").</dd>
 
@@ -204,7 +210,7 @@ As a sample data, transformed from "Call to Quarters" (https://archive.org/detai
 ![wavelet result](example/Call_To_Quarters-wavelet.png)
 
 ```
- wavlet -p cd -c 2 --floor-gain -110 -v -o Call_To_Quarters-wavelet2.png Call_To_Quarters.wav
+ wavlet -p cd -c 2 -a --floor-gain -110 -v -o Call_To_Quarters-wavelet2.png Call_To_Quarters.wav
 ```
 ![wavelet result](example/Call_To_Quarters-wavelet2.png)
 

data/bin/wavfft

@@ -127,6 +127,10 @@ OptionParser.new {|opt|
     params[:ceil] = val
   }
 
+  opt.on("--luminance=NUM", Float) { |val|
+    params[:luminance] = val
+  }
+
   opt.on("-g", "--frequency-grid=BASIS,STEP", Array) { |val|
     params[:basis_freq] = val[0].to_f
     params[:grid_step]  = val[1].to_f

data/bin/wavlet

@@ -89,6 +89,10 @@ OptionParser.new {|opt|
     params[:sigma] = val
   }
 
+  opt.on("-t", "--gabor-threshold=NUMBER", Float) {|val|
+    params[:threshold] = val
+  }
+
   opt.on("-u", "--unit-time=CENTISECOND", Integer) {|val|
     params[:unit_time] = val * 10
   }
@@ -109,6 +113,10 @@ OptionParser.new {|opt|
     params[:ceil] = val
   }
 
+  opt.on("--luminance=NUM", Float) { |val|
+    params[:luminance] = val
+  }
+
   opt.on("-g", "--frequency-grid=BASIS,STEP", Array) { |val|
     params[:basis_freq] = val[0].to_f
     params[:grid_step]  = val[1].to_f

data/ext/wavspa/fb/rb_fb.c

@@ -28,6 +28,7 @@ typedef struct {
   double ceil;
   double floor;
   double range;
+  double lumi;
 
   VALUE buf;
 } rb_fb_t;
@@ -303,6 +304,7 @@ static const char* opts_keys[] = {
   "margin_y",
   "ceil",
   "floor",
+  "luminance",
 };
 
 static ID opts_ids[N(opts_keys)];
@@ -360,6 +362,7 @@ rb_fb_alloc(VALUE self)
   ptr->ceil     = -10.0;
   ptr->floor    = -90.0;
   ptr->range    = ptr->ceil - ptr->floor;
+  ptr->lumi     = 3.5;
   ptr->size     = -1;
   ptr->buf      = Qnil;
 
@@ -413,6 +416,9 @@ rb_fb_initialize(int argc, VALUE* argv, VALUE self)
 
     // :floor
     if (opts[4] != Qundef) ptr->floor = NUM2DBL(opts[4]);
+
+    // :numinance
+    if (opts[5] != Qundef) ptr->lumi = NUM2DBL(opts[5]);
   }
 
   ptr->width  = FIX2INT(width);
@@ -512,7 +518,7 @@ rb_fb_draw_power(VALUE self, VALUE col, VALUE dat)
   for (i = 0; i < ptr->height; i++) {
     memcpy(&x, src, sizeof(double));
 
-    v = round(x * 3.5);
+    v = round(x * 1024 * ptr->lumi);
 
     if (v < 0) {
       v = 0;
@@ -650,7 +656,7 @@ put_string(rb_fb_t* ptr, int row, int col,
       p += (ptr->stride - (5 * 3));
     }
 
-    col += 5;
+    col += 6;
   }
 }
 

data/ext/wavspa/fft/fft.c

@@ -573,6 +573,8 @@ set_linear_mapping(fft_t* fft)
     head = tail;
     lc++;
   }
+
+  fft->step = step;
 }
 
 static void
@@ -600,6 +602,8 @@ set_log_mapping(fft_t* fft)
     head = tail;
     lc++;
   }
+
+  fft->step = step;
 }
 
 static void
@@ -769,15 +773,15 @@ fft_transform(fft_t* fft)
 }
 
 int
-fft_calc_spectrum(fft_t* fft, double* dst)
+fft_calc_power(fft_t* fft, double* dst)
 {
   int ret;
   int i;
   int j;
   double* a;
-  double v;
-  double base;
   lc_t* lc;
+  double v;
+  double fq;
 
   do {
     /*
@@ -801,14 +805,18 @@ fft_calc_spectrum(fft_t* fft, double* dst)
     /*
      * calc power spectrum
      */
-    //base = (double)fft->used;
 
     for (i = 0, lc = (lc_t*)fft->line; i < fft->width; i++, lc++) {
-      v = 0;
+      v = 0.0;
+
+      if (fft->mode == FFT_LINEARSCALE_MODE) {
+        fq = fft->fq_l + (fft->step * i);
+      } else {
+        fq = fft->fq_l * pow(fft->step, i);
+      } 
 
       for(j = 0, a = fft->a + (lc->pos * 2); j < lc->n; j++, a += 2) {
-        //v += 10.0 * log10(((a[0] * a[0]) + (a[1] * a[1])) / base);
-        v += 10.0 * log10((a[0] * a[0]) + (a[1] * a[1]));
+        v += (sqrt((a[0] * a[0]) + (a[1] * a[1])) / fq);
       }
 
       dst[i] = v / j;
@@ -849,7 +857,7 @@ fft_calc_amplitude(fft_t* fft, double* dst)
     }
 
     /*
-     * calc power spectrum
+     * calc amplitude spectrum
      */
     base = (double)fft->used;
 

data/ext/wavspa/fft/fft.h

@@ -32,13 +32,15 @@ typedef struct {
   int magnify;
 
   void* line;
-  int width;
 
-  int mode;
   double fq_s;  // as "sampline frequency"
   double fq_h;  // as "high-side frequency"
   double fq_l;  // as "low-side frequency"
 
+  int mode;
+  int width;
+  double step;
+
   double* a;
   int* ip;
   double* w;
@@ -55,7 +57,7 @@ int fft_set_frequency(fft_t* fft, double s, double l, double h);
 int fft_shift_in(fft_t* fft, void* data, int n);
 int fft_reset(fft_t* fft);
 int fft_transform(fft_t* fft);
-int fft_calc_spectrum(fft_t* fft, double* dst);
+int fft_calc_power(fft_t* fft, double* dst);
 int fft_calc_amplitude(fft_t* fft, double* dst);
 int fft_calc_absolute(fft_t* fft, double* dst);
 

data/ext/wavspa/fft/rb_fft.c

@@ -343,7 +343,7 @@ rb_fft_set_frequency(VALUE self, VALUE freq)
 
 
 static VALUE
-rb_fft_spectrum(VALUE self)
+rb_fft_power(VALUE self)
 {
   rb_fft_t* ptr;
   VALUE ret;
@@ -366,9 +366,9 @@ rb_fft_spectrum(VALUE self)
    * call transform function
    */
   dat = RSTRING_PTR(ret);
-  err = fft_calc_spectrum(ptr->fft, dat);
+  err = fft_calc_power(ptr->fft, dat);
   if (err) {
-    RUNTIME_ERROR( "fft_calc_spectrum() failed. [err = %d]\n", err);
+    RUNTIME_ERROR( "fft_calc_power() failed. [err = %d]\n", err);
   }
 
   return ret;
@@ -455,7 +455,7 @@ Init_fft()
   rb_define_method(fft_klass, "transform", rb_fft_transform, 0);
   rb_define_method(fft_klass, "enqueue", rb_fft_enqueue, 1);
   rb_define_method(fft_klass, "<<", rb_fft_enqueue, 1);
-  rb_define_method(fft_klass, "spectrum", rb_fft_spectrum, 0);
+  rb_define_method(fft_klass, "power", rb_fft_power, 0);
   rb_define_method(fft_klass, "amplitude", rb_fft_amplitude, 0);
   rb_define_method(fft_klass, "absolute", rb_fft_absolute, 0);
 }

data/ext/wavspa/wavelet/rb_wavelet.c

@@ -26,6 +26,7 @@ static VALUE wavelet_klass;
 
 static const char* wavelet_opts_keys[] = {
   "sigma",            // {float}
+  "gabor_threshold",  // {float}
   "frequency",        // {float}
   "range",            // {Range}
   "scale_mode",       // {str}
@@ -73,6 +74,19 @@ eval_wavelet_opt_sigma(rb_wavelet_t* ptr, VALUE opt)
   }
 }
 
+static void
+eval_wavelet_opt_gabor_threshold(rb_wavelet_t* ptr, VALUE opt)
+{
+  int err;
+
+  if (opt != Qundef) {
+    err = walet_set_gabor_threshold(ptr->wl, NUM2DBL(opt));
+    if (err) {
+      RUNTIME_ERROR("walet_set_gabor_threshold() failed. [err=%d]", err);
+    }
+  }
+}
+
 static void
 eval_wavelet_opt_frequency(rb_wavelet_t* ptr, VALUE opt)
 {
@@ -154,10 +168,11 @@ set_wavelet_context(rb_wavelet_t* ptr, VALUE opt)
    * set context
    */
   eval_wavelet_opt_sigma(ptr, opts[0]);
-  eval_wavelet_opt_frequency(ptr, opts[1]);
-  eval_wavelet_opt_range(ptr, opts[2]);
-  eval_wavelet_opt_scale_mode(ptr, opts[3]);
-  eval_wavelet_opt_output_width(ptr, opts[4]);
+  eval_wavelet_opt_gabor_threshold(ptr, opts[1]);
+  eval_wavelet_opt_frequency(ptr, opts[2]);
+  eval_wavelet_opt_range(ptr, opts[3]);
+  eval_wavelet_opt_scale_mode(ptr, opts[4]);
+  eval_wavelet_opt_output_width(ptr, opts[5]);
 }
 
 static VALUE
@@ -236,6 +251,43 @@ rb_wavelet_set_sigma(VALUE self, VALUE sigma)
   return sigma;
 }
 
+static VALUE
+rb_wavelet_get_gabor_threshold(VALUE self)
+{
+  VALUE ret;
+  rb_wavelet_t* ptr;
+  
+  /*
+   * strip object
+   */
+  Data_Get_Struct(self, rb_wavelet_t, ptr);
+
+  /*
+   * create return paramter
+   */
+  ret = DBL2NUM(ptr->wl->gth);
+
+  return ret;
+}
+
+static VALUE
+rb_wavelet_set_gabor_threshold(VALUE self, VALUE th)
+{
+  rb_wavelet_t* ptr;
+  
+  /*
+   * strip object
+   */
+  Data_Get_Struct(self, rb_wavelet_t, ptr);
+
+  /*
+   * call setter function
+   */
+  eval_wavelet_opt_gabor_threshold(ptr, th);
+
+  return th;
+}
+
 static VALUE
 rb_wavelet_get_frequency(VALUE self)
 {
@@ -683,6 +735,10 @@ Init_wavelet()
   rb_define_method(wavelet_klass, "initialize", rb_wavelet_initialize, -1);
   rb_define_method(wavelet_klass, "sigma", rb_wavelet_get_sigma, 0);
   rb_define_method(wavelet_klass, "sigma=", rb_wavelet_set_sigma, 1);
+  rb_define_method(wavelet_klass, "gabor_threshold",
+                                  rb_wavelet_get_gabor_threshold, 0);
+  rb_define_method(wavelet_klass, "gabor_threshold=",
+                                  rb_wavelet_set_gabor_threshold, 1);
   rb_define_method(wavelet_klass, "frequency", rb_wavelet_get_frequency, 0);
   rb_define_method(wavelet_klass, "frequency=", rb_wavelet_set_frequency, 1);
   rb_define_method(wavelet_klass, "range", rb_wavelet_get_range, 0);

data/ext/wavspa/wavelet/walet.c

@@ -30,29 +30,31 @@
 #define DEFAULT_LOW_FREQ        100.0
 #define DEFAULT_HIGH_FREQ       2000.0
 #define DEFAULT_SIGMA           3.0
+#define DEFAULT_GABOR_THRESHOLD 0.01
 #define DEFAULT_OUTPUT_WIDTH    360
 #define DEFAULT_SCALE_MODE      WALET_LOGSCALE_MODE
-                               
-#define GABOR_THRESHOLD         0.01
 
 #define F_DIRTY                 0x00000001
                 
-#define CALC_WK0(sig)           ((sig) * sqrt(-2.0 * log(GABOR_THRESHOLD)))
+#define CALC_WK0(sig,th)        ((sig) * sqrt(-2.0 * log(th)))
 #define CALC_WK1(sig)           (1.0 / sqrt(M_PI2 * (sig) * (sig)))
 #define CALC_WK2(sig)           (2.0 * (sig) * (sig))
                              
 static double
-calc_step(int mode, double low, double high, int width)
+calc_step(int mode, double low, double high, int width, double* tbl)
 {
   double ret;
+  int i;
 
   switch (mode) {
   case WALET_LINEARSCALE_MODE:
     ret = (high - low) / width;
+    for (i = 0; i < width; i++) tbl[i] = low + (ret * i);
     break;
 
   case WALET_LOGSCALE_MODE:
     ret = pow(high / low, 1.0 / (double)width);
+    for (i = 0; i < width; i++) tbl[i] = low * pow(ret, i);
     break;
 
   default:
@@ -67,17 +69,9 @@ static void
 reset_window_size_table(walet_t* ptr)
 {
   int i;
-  double fq;
 
-  fq = ptr->fq_l;
   for (i = 0; i < ptr->width; i++) {
-    ptr->ws[i] = (int)(((1.0 / fq) * ptr->wk0) * ptr->fq_s);
-
-    if (ptr->mode == WALET_LINEARSCALE_MODE) {
-      fq += ptr->step;
-    } else {
-      fq *= ptr->step;
-    }
+    ptr->ws[i] = (int)(((1.0 / ptr->ft[i]) * ptr->wk0) * ptr->fq_s);
   }
 }
 
@@ -88,6 +82,7 @@ walet_new(walet_t** _obj)
   walet_t* obj;
   int* ws;
   double* wt;
+  double* ft;
 
   /*
    * initialize
@@ -96,6 +91,7 @@ walet_new(walet_t** _obj)
   obj = NULL;
   wt  = NULL;
   ws  = NULL;
+  ft  = NULL;
 
   do {
     /*
@@ -127,6 +123,12 @@ walet_new(walet_t** _obj)
       break;
     }
 
+    ft = NALLOC(double, DEFAULT_OUTPUT_WIDTH);
+    if (ft == NULL) {
+      ret = ERR;
+      break;
+    }
+
     /*
      * set initial parameter
      */
@@ -135,15 +137,17 @@ walet_new(walet_t** _obj)
     obj->fq_l  = DEFAULT_LOW_FREQ;
     obj->fq_h  = DEFAULT_HIGH_FREQ;
     obj->sigma = DEFAULT_SIGMA;
-    obj->wk0   = CALC_WK0(DEFAULT_SIGMA);
+    obj->gth   = DEFAULT_GABOR_THRESHOLD;
+    obj->wk0   = CALC_WK0(DEFAULT_SIGMA, obj->gth);
     obj->wk1   = CALC_WK1(DEFAULT_SIGMA);
     obj->wk2   = CALC_WK2(DEFAULT_SIGMA);
     obj->width = DEFAULT_OUTPUT_WIDTH;
     obj->mode  = DEFAULT_SCALE_MODE;
-    obj->step  = calc_step(obj->mode, obj->fq_l, obj->fq_h, obj->width);
+    obj->step  = calc_step(obj->mode, obj->fq_l, obj->fq_h, obj->width, ft);
     obj->smpl  = NULL;
     obj->ws    = ws;
     obj->wt    = wt;
+    obj->ft    = ft;
 
     /*
      * put return parameter
@@ -155,9 +159,10 @@ walet_new(walet_t** _obj)
    * post process
    */
   if (ret) {
-    if (obj != NULL) free(obj);
-    if (wt != NULL) free(wt);
     if (ws != NULL) free(ws);
+    if (wt != NULL) free(wt);
+    if (ft != NULL) free(ft);
+    if (obj != NULL) free(obj);
   }
 
   return ret;
@@ -183,7 +188,7 @@ walet_set_sigma(walet_t* ptr, double sigma)
    */
   if (!ret) {
     ptr->sigma  = sigma;
-    ptr->wk0    = CALC_WK0(sigma);
+    ptr->wk0    = CALC_WK0(sigma, ptr->gth);
     ptr->wk1    = CALC_WK1(sigma);
     ptr->wk2    = CALC_WK2(sigma);
 
@@ -193,6 +198,36 @@ walet_set_sigma(walet_t* ptr, double sigma)
   return ret;
 }
 
+int
+walet_set_gabor_threshold(walet_t* ptr, double th)
+{
+  int ret;
+
+  /*
+   * initialize
+   */
+  ret = 0;
+
+  /*
+   * argument check
+   */
+  if (ptr == NULL) ret = ERR;
+
+  /*
+   * set parameter
+   */
+  if (!ret) {
+    ptr->gth = th;
+    ptr->wk0 = CALC_WK0(ptr->sigma, th);
+    ptr->wk1 = CALC_WK1(ptr->sigma);
+    ptr->wk2 = CALC_WK2(ptr->sigma);
+
+    ptr->flags |= F_DIRTY;
+  }
+
+  return ret;
+}
+
 int
 walet_set_frequency(walet_t* ptr, double freq)
 {
@@ -263,7 +298,7 @@ walet_set_range(walet_t* ptr, double low, double high)
     /*
      * calc step
      */
-    step = calc_step(ptr->mode, low, high, ptr->width);
+    step = calc_step(ptr->mode, low, high, ptr->width, ptr->ft);
     if (isnan(step)) {
       ret = ERR;
       break;
@@ -311,7 +346,7 @@ walet_set_scale_mode(walet_t* ptr, int mode)
     /*
      * calc step
      */
-    step = calc_step(mode, ptr->fq_l, ptr->fq_h, ptr->width);
+    step = calc_step(mode, ptr->fq_l, ptr->fq_h, ptr->width, ptr->ft);
     if (isnan(step)) {
       ret = ERR;
       break;
@@ -335,6 +370,7 @@ walet_set_output_width(walet_t* ptr, int width)
   int ret;
   int* ws;
   double* wt;
+  double* ft;
   double step;
 
   /*
@@ -343,6 +379,7 @@ walet_set_output_width(walet_t* ptr, int width)
   ret = 0;
   ws  = NULL;
   wt  = NULL;
+  ft  = NULL;
 
   do {
     /*
@@ -359,25 +396,27 @@ walet_set_output_width(walet_t* ptr, int width)
     }
 
     /*
-     * alloc window size area
+     * alloc new buffers
      */
     ws = NALLOC(int, width);
     if (ws == NULL) {
       ret = ERR;
     }
 
-    /*
-     * alloc result area
-     */
     wt = NALLOC(double, width * 2);
     if (wt == NULL) {
       ret = ERR;
     }
 
+    ft = NALLOC(double, width);
+    if (ft == NULL) {
+      ret = ERR;
+    }
+
     /*
      * calc step
      */
-    step = calc_step(ptr->mode, ptr->fq_l, ptr->fq_h, width);
+    step = calc_step(ptr->mode, ptr->fq_l, ptr->fq_h, width, ft);
     if (isnan(step)) {
       ret = ERR;
       break;
@@ -388,11 +427,13 @@ walet_set_output_width(walet_t* ptr, int width)
      */
     if (ptr->wt != NULL) free(ptr->wt);
     if (ptr->ws != NULL) free(ptr->ws);
+    if (ptr->ft != NULL) free(ptr->ft);
 
-    ptr->width  = width;
-    ptr->ws     = ws;
-    ptr->wt     = wt;
-    ptr->step   = step;
+    ptr->width = width;
+    ptr->ws    = ws;
+    ptr->wt    = wt;
+    ptr->ft    = ft;
+    ptr->step  = step;
 
     ptr->flags |= F_DIRTY;
   } while (0);
@@ -604,7 +645,6 @@ int
 walet_transform(walet_t* ptr, int pos)
 {
   int ret;
-  double fq;
   int dx;
 
   int i;
@@ -650,7 +690,6 @@ walet_transform(walet_t* ptr, int pos)
     /*
      * integla for window
      */
-    fq = ptr->fq_l;
     for (i = 0, wt = ptr->wt; i < ptr->width; i++, wt += 2) {
       dx = ptr->ws[i];
 
@@ -664,7 +703,7 @@ walet_transform(walet_t* ptr, int pos)
 #pragma omp parallel for private(t,gss,omt) reduction(+:re,im)
 #endif /* defined(_OPENMP) */
       for (j = st; j <= ed; j++) {
-        t   = ((double)j / ptr->fq_s) * fq;
+        t   = ((double)j / ptr->fq_s) * ptr->ft[i];
         gss = ptr->wk1 * exp(-t * (t / ptr->wk2)) * (ptr->smpl[pos + j]);
         omt = M_PI2 * t;
 
@@ -675,12 +714,6 @@ walet_transform(walet_t* ptr, int pos)
 
       wt[0] = re;
       wt[1] = im;
-
-      if (ptr->mode == WALET_LINEARSCALE_MODE) {
-        fq += ptr->step;
-      } else {
-        fq *= ptr->step;
-      }
     }
 
   } while (0);
@@ -694,7 +727,6 @@ walet_calc_power(walet_t* ptr, double* dst)
   int ret;
   int i;
   double* wt;
-  double base;
 
   /*
    * initialize
@@ -720,12 +752,14 @@ walet_calc_power(walet_t* ptr, double* dst)
      */
 
 #ifdef _OPENMP
-#pragma omp parallel private(base,wt)
+#pragma omp parallel private(wt)
 #endif /* defined(_OPENMP) */
+
     for (i = 0; i < ptr->width; i++) {
-      wt     = ptr->wt + (i * 2);
-      base   = ptr->ws[i] * 2;
-      dst[i] = 10 * log10(((wt[0] * wt[0]) + (wt[1] * wt[1])) / base);
+      wt = ptr->wt + (i * 2);
+
+      // 末尾の計数256はFFTでの表示に合わせて適当に値を見繕ってるので注意
+      dst[i] = (sqrt((wt[0] * wt[0]) + (wt[1] * wt[1])) / ptr->ft[i]) * 256;
     }
   } while (0);
 
@@ -795,7 +829,9 @@ walet_destroy(walet_t* ptr)
    */
   if (!ret) {
     if (ptr->smpl != NULL) free(ptr->smpl);
+    if (ptr->ws != NULL) free(ptr->ws);
     if (ptr->wt != NULL) free(ptr->wt);
+    if (ptr->ft != NULL) free(ptr->ft);
     free(ptr);
   }
 

data/ext/wavspa/wavelet/walet.h

@@ -21,31 +21,34 @@
 typedef struct __walet__ {
   int flags;
 
-  double fq_s;  // as "sampleing frequency"
-  double fq_l;  // as "low side frequency"
-  double fq_h;  // as "high side fequency"
+  double fq_s;    // as "sampleing frequency"
+  double fq_l;    // as "low side frequency"
+  double fq_h;    // as "high side fequency"
 
   double sigma;
+  double gth;     // as "gabor threshold"
   double wk0;
   double wk1;
   double wk2;
-  int* ws;   // as window size list
+  int* ws;        // as window size list
   double** exp;
 
   int width;
   int mode;
   double step;
 
-  double* smpl; // as "sample data"
-  int n;        // as "number of sample size"
+  double* smpl;   // as "sample data"
+  int n;          // as "number of sample size"
 
   double* wt;
+  double* ft;     // as "frequency table"
 } walet_t;
 
 int walet_new(walet_t** ptr);
 int walet_destroy(walet_t* ptr);
 
 int walet_set_sigma(walet_t* ptr, double sigma);
+int walet_set_gabor_threshold(walet_t* ptr, double th);
 int walet_set_frequency(walet_t* ptr, double freq);
 int walet_set_range(walet_t* ptr, double low, double high);
 int walet_set_scale_mode(walet_t* ptr, int mode);

data/lib/wavspa/version.rb

@@ -1,3 +1,3 @@
 module WavSpectrumAnalyzer
-  VERSION = "0.3.2"
+  VERSION = "0.4.2"
 end

data/lib/wavspa/wavfft/main.rb

@@ -28,6 +28,7 @@ module WavSpectrumAnalyzer
         @freq_range     = param[:range]
         @ceil           = param[:ceil]
         @floor          = param[:floor]
+        @luminance      = param[:luminance]
         @col_step       = param[:col_step]
                        
         @scale_mode     = param[:scale_mode]
@@ -65,7 +66,8 @@ module WavSpectrumAnalyzer
                                 :margin_x => ($draw_freq_line)? 50:0,
                                 :margin_y => ($draw_time_line)? 30:0,
                                 :ceil => @ceil,
-                                :floor => @floor)
+                                :floor => @floor,
+                                :luminance => @luminance)
 
         if $verbose
           STDERR.print <<~EOT
@@ -104,8 +106,8 @@ module WavSpectrumAnalyzer
 
           fft << wav.read(usize)
 
-          if @transfer_mode == :POWER
-            fb.draw_power(rows, fft.spectrum)
+          if @transform_mode == :POWER
+            fb.draw_power(rows, fft.power)
           else
             fb.draw_amplitude(rows, fft.amplitude)
           end

data/lib/wavspa/wavfft/preset.rb

@@ -20,6 +20,7 @@ module WavSpectrumAnalyzer
         :range           => [200, 8000],
         :ceil            => -10.0,
         :floor           => -90.0,
+        :luminance       => 3.5,
         :col_step        => 1,
       },
 
@@ -33,6 +34,7 @@ module WavSpectrumAnalyzer
         :range           => [200, 16000],
         :ceil            => -10.0,
         :floor           => -90.0,
+        :luminance       => 3.5,
         :col_step        => 1,
       },
 
@@ -46,6 +48,7 @@ module WavSpectrumAnalyzer
         :range           => [50, 22000],
         :ceil            => -10.0,
         :floor           => -90.0,
+        :luminance       => 3.5,
         :col_step        => 1,
       },
 
@@ -59,6 +62,7 @@ module WavSpectrumAnalyzer
         :range           => [200, 32000],
         :ceil            => -10.0,
         :floor           => -90.0,
+        :luminance       => 3.5,
         :col_step        => 1,
       },
     }

data/lib/wavspa/wavlet/main.rb

@@ -22,11 +22,13 @@ module WavSpectrumAnalyzer
         @transform_mode = param[:transform_mode]
         @unit_time      = param[:unit_time]
         @sigma          = param[:sigma]
+        @threshold      = param[:threshold]
         @output_width   = param[:output_width]
                        
         @freq_range     = param[:range]
         @ceil           = param[:ceil]
         @floor          = param[:floor]
+        @luminance      = param[:luminance]
         @col_step       = param[:col_step]
                        
         @scale_mode     = param[:scale_mode]
@@ -49,11 +51,13 @@ module WavSpectrumAnalyzer
         wav = WavFile.open(input)
         wl  = Wavelet.new
 
-        wl.frequency  = wav.sample_rate
-        wl.sigma      = @sigma
-        wl.range      = (@lo_freq .. @hi_freq)
-        wl.scale_mode = @scale_mode
-        wl.width      = @output_width
+        wl.frequency       = wav.sample_rate
+        wl.sigma           = @sigma
+        wl.gabor_threshold = @threshold
+        wl.range           = (@lo_freq .. @hi_freq)
+        wl.scale_mode      = @scale_mode
+        wl.width           = @output_width
+
 
         wl.put_in("s%dle" % wav.sample_size, wav.read)
 
@@ -67,30 +71,32 @@ module WavSpectrumAnalyzer
                                 :margin_x => ($draw_freq_line)? 50:0,
                                 :margin_y => ($draw_time_line)? 30:0,
                                 :ceil => @ceil,
-                                :floor => @floor)
+                                :floor => @floor,
+                                :luminance => @luminance)
 
         if $verbose
           STDERR.print <<~EOT
             - input data
               #{input}
-                data size:   #{wav.data_size}
-                channel num: #{wav.channel_num}
-                sample rate: #{wav.sample_rate} Hz
-                sample size: #{wav.sample_size} bits
-                data rate:   #{wav.bytes_per_sec} bytes/sec
+                data size:       #{wav.data_size}
+                channel num:     #{wav.channel_num}
+                sample rate:     #{wav.sample_rate} Hz
+                sample size:     #{wav.sample_size} bits
+                data rate:       #{wav.bytes_per_sec} bytes/sec
 
             - WAVELET parameter
-                sigma:       #{@sigma}
-                unit time:   #{@unit_time} ms
+                sigma:           #{@sigma}
+                gabor threshold: #{@threshold}
+                unit time:       #{@unit_time} ms
 
             - OUTPUT
-                width:       #{fb.width}px
-                height:      #{fb.height}px
-                freq range:  #{@lo_freq} - #{@hi_freq}Hz
-                scale mode:  #{@scale_mode}
-                plot mode :  #{@transform_mode}
-                ceil:        #{@ceil}
-                floor:       #{@floor}
+                width:           #{fb.width}px
+                height:          #{fb.height}px
+                freq range:      #{@lo_freq} - #{@hi_freq}Hz
+                scale mode:      #{@scale_mode}
+                plot mode :      #{@transform_mode}
+                ceil:            #{@ceil}
+                floor:           #{@floor}
 
           EOT
         end

data/lib/wavspa/wavlet/preset.rb

@@ -12,6 +12,7 @@ module WavSpectrumAnalyzer
     PRESET_TABLE = {
       "default" => {
         :sigma           => 24.0,
+        :threshold       => 0.01,
         :unit_time       => 10 * 10,
         :scale_mode      => :LOGSCALE,
         :transform_mode  => :POWER,
@@ -19,11 +20,13 @@ module WavSpectrumAnalyzer
         :range           => [200.0, 8000.0],
         :ceil            => -10.0,
         :floor           => -90.0,
+        :luminance       => 3.5,
         :col_step        => 1,
       },
 
       "cd" => {
         :sigma           => 24.0,
+        :threshold       => 0.01,
         :unit_time       => 5 * 10,
         :scale_mode      => :LOGSCALE,
         :transform_mode  => :POWER,
@@ -31,6 +34,7 @@ module WavSpectrumAnalyzer
         :range           => [50.0, 22050.0],
         :ceil            => -10.0,
         :floor           => -90.0,
+        :luminance       => 3.5,
         :col_step        => 1,
       },
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavspa
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.2
 platform: ruby
 authors:
 - Hirosho Kuwagata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-06 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler