wavspa 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd2d32dcf12a061f9555e5cd32be4e6f9623e45622f838614077d03a13f1c625
-  data.tar.gz: '0906de0b8e96773d3e61a73fada4b1675a1925a44b6234d9db144b69524cf931'
+  metadata.gz: 016b7487caeb4a42705bb51e79db41769ba020fe43f7aca190c71f08333cda53
+  data.tar.gz: 7fe6ee374e29d9b47c74944959ab4f0cd9a525821a1cb7e55bb1204de025c4f1
 SHA512:
-  metadata.gz: 7654f8485ac753d0691029422ff367c469c7597577865fda342da8ae923c96587447db33a47332a815b27c5e473bdb8235951ab4ffe1f2f1a7c76f81cd79ed8b
-  data.tar.gz: 5f35c4b6845fc6827314f9f5038a831db73f8a60aeb4519c258cfaefa18fa9c4b6d9f0a6610d6e4a9daa8059c476e1aeb2e8722716c2a53eacdd9f4fd0ff5bb2
+  metadata.gz: 44df366c15ba55ca2ec19c077d140cf3c1c85caa37d855d43b1c40ebfd515af0f910d1a46776f9d12f7ea99496ffcb1d854b85d8d6a0fc1726c7f63510793aec
+  data.tar.gz: 3e2316a4d6c88748c25ea5e5635ad0f915f1dd716a9e8c701870a9945b3247fd0bdfdb3dceea0fbaac47f87ab669a5c91aa88184f7bfe750a992ddb2fcbd13ed

data/README.md

@@ -32,19 +32,21 @@ wavfft [options] WAV-FILE
 options:
     -o, --output=FILE
     -p, --preset=NAME
+    -a, --amplitude-mode
     -f, --fft-size=SIZE
-    -u, --unit-time=CS
+    -u, --unit-time=MSEC
     -W, --output-width=SIZE
     -w, --window-function=FUNCTION
     -r, --frequency-range=LO,HI
-    -g, --frequnecy-grid=BASIS,STEP
+        --floor-gain=DB
+        --ceil-gain=DB
+    -g, --frequency-grid=BASIS,STEP
     -m, --scale-mode=MODE
-        --show-params
     -c, --col-steps=SIZE
-    -F, --draw-freq-line
-    -T, --draw-time-line
+        --show-params
+    -F, --no-draw-freq-line
+    -T, --no-draw-time-line
     -v, --verbose
-    -h, --help
 ```
 
 #### options
@@ -56,6 +58,10 @@ options:
   <dt>-p, --preset=NAME</dt>
   <dd>specify preset settings. you can specify one of "default", "32k" or "cd".</dd>
 
+  <dt>-a, --amplitude-mode</dt>
+  <dd>When this option is specified, the amplitude spectrum is output (otherwise, the power spectrum is output).</dd>
+
+
   <dt>-f, --fft-size=FFT</dt>
   <dd>specify the FFT size (by number of samples, this value must spcify a power of 2).</dd>
 
@@ -65,9 +71,18 @@ options:
   <dt>-W, --output-width=SIZE</dt>
   <dd>specify the hight of output PNG (by number of pixels).</dd>
 
+  <dt>-w, --window-function=FUNCTION</dt>
+  <dd>specify name of windows function for short time FFT. you can specify one of "RECTANGULAR", "HAMMING", "HANN", "BLACKMAN", "BLACKMAN\_NUTTALL", "FLAT\_TOP". </dd>
+
   <dt>-r, --frequency-range=LO,HI</dt>
   <dd>specify the frequency band show on the output PNG (upper limit to "HI", and lower limit to "LO").<dd>
 
+  <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>-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>
 
@@ -80,11 +95,11 @@ options:
   <dt>--show-params</dt>
   <dd>show sumarry of settings.</dd>
 
-  <dt>-F, --draw-freq-line</dt>
-  <dd>enable frequency line (vertical grid).</dd>
+  <dt>-F, --no-draw-freq-line</dt>
+  <dd>disable frequency line (vertical grid).</dd>
 
-  <dt>-F, --draw-freq-line</dt>
-  <dd>enable time line (horizontal grid).</dd>
+  <dt>-F, --no-draw-freq-line</dt>
+  <dd>disable time line (horizontal grid).</dd>
 
    <dt>-v, --verbose</dt>
    <dd>enable verbose mode</dd>
@@ -140,10 +155,10 @@ options:
   <dd>specify the frequency band show on the output PNG (upper limit to "HI", and lower limit to "LO").<dd>
 
   <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.</dd>
+  <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.</dd>
+  <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>-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>
@@ -176,7 +191,7 @@ As a sample data, transformed from "Call to Quarters" (https://archive.org/detai
 
 ### FFT
 ```
- wavfft -p cd -F -T -v -o Call_To_Quarters-fft.png Call_To_Quarters.wav
+ wavfft -p cd -c 2 -v -o Call_To_Quarters-fft.png Call_To_Quarters.wav
 ```
 
 ![FFT result](example/Call_To_Quarters-fft.png)
@@ -184,12 +199,12 @@ As a sample data, transformed from "Call to Quarters" (https://archive.org/detai
 
 ### Wavelet
 ```
- wavlet -p cd -F -T -c 2 -v -o Call_To_Quarters-wavelet.png Call_To_Quarters.wav
+ wavlet -p cd -c 2 -v -o Call_To_Quarters-wavelet.png Call_To_Quarters.wav
 ```
 ![wavelet result](example/Call_To_Quarters-wavelet.png)
 
 ```
- wavlet -p cd -F -T -c 2 --floor-gain -110 -v -o Call_To_Quarters-wavelet2.png Call_To_Quarters.wav
+ wavlet -p cd -c 2 --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

@@ -52,6 +52,10 @@ output = nil
 #
 
 OptionParser.new {|opt|
+  $draw_freq_line = true
+  $draw_time_line = true
+  $verbose        = false
+
   window_funcs = %w{
     RECTANGULAR HAMMING HANN BLACKMAN BLACKMAN_NUTTALL FLAT_TOP
   }
@@ -80,6 +84,10 @@ OptionParser.new {|opt|
     end
   }
 
+  opt.on("-a", "--amplitude-mode", Integer) {|val|
+    params[:transform_mode] = :AMPLITUDE
+  }
+
   opt.on("-f", "--fft-size=SIZE", Integer) {|val|
     params[:fft_size] = val
   }
@@ -111,6 +119,14 @@ OptionParser.new {|opt|
     params[:range] = [val[0].to_f, val[1].to_f]
   }
 
+  opt.on("--floor-gain=DB", Float) {|val|
+    params[:floor] = val
+  }
+
+  opt.on("--ceil-gain=DB", Float) {|val|
+    params[:ceil] = val
+  }
+
   opt.on("-g", "--frequency-grid=BASIS,STEP", Array) { |val|
     params[:basis_freq] = val[0].to_f
     params[:grid_step]  = val[1].to_f
@@ -140,12 +156,12 @@ OptionParser.new {|opt|
     exit
   }
 
-  opt.on("-F", "--draw-freq-line") {
-    $draw_freq_line = true
+  opt.on("-F", "--no-draw-freq-line") {
+    $draw_freq_line = false
   }
 
-  opt.on("-T", "--draw-time-line") {
-    $draw_time_line = true
+  opt.on("-T", "--no-draw-time-line") {
+    $draw_time_line = false
   }
 
   opt.on('-v', "--verbose") {

data/bin/wavlet

@@ -52,6 +52,10 @@ output = nil
 #
 
 OptionParser.new {|opt|
+  $draw_freq_line = true
+  $draw_time_line = true
+  $verbose        = false
+
   opt.banner += " WAV-FILE"
   opt.version = VERSION
 
@@ -77,14 +81,14 @@ OptionParser.new {|opt|
     end
   }
 
-  opt.on("-s", "--sigma=NUMBER", Float) {|val|
-    params[:sigma] = val
-  }
-
   opt.on("-a", "--amplitude-mode", Integer) {|val|
     params[:transform_mode] = :AMPLITUDE
   }
 
+  opt.on("-s", "--sigma=NUMBER", Float) {|val|
+    params[:sigma] = val
+  }
+
   opt.on("-u", "--unit-time=CENTISECOND", Integer) {|val|
     params[:unit_time] = val * 10
   }
@@ -136,12 +140,12 @@ OptionParser.new {|opt|
     exit
   }
 
-  opt.on("-F", "--draw-freq-line") {
-    $draw_freq_line = true
+  opt.on("-F", "--no-draw-freq-line") {
+    $draw_freq_line = false
   }
 
-  opt.on("-T", "--draw-time-line") {
-    $draw_time_line = true
+  opt.on("-T", "--no-draw-time-line") {
+    $draw_time_line = false
   }
 
   opt.on('-v', "--verbose") {

data/ext/wavspa/fb/rb_fb.c

@@ -25,6 +25,10 @@ typedef struct {
   int stride;
   int size;
 
+  double ceil;
+  double floor;
+  double range;
+
   VALUE buf;
 } rb_fb_t;
 
@@ -297,6 +301,8 @@ static const char* opts_keys[] = {
   "column_step",
   "margin_x",
   "margin_y",
+  "ceil",
+  "floor",
 };
 
 static ID opts_ids[N(opts_keys)];
@@ -351,6 +357,9 @@ rb_fb_alloc(VALUE self)
   ptr->step     = 1;
   ptr->margin_x = 0;
   ptr->margin_y = 0;
+  ptr->ceil     = -10.0;
+  ptr->floor    = -90.0;
+  ptr->range    = ptr->ceil - ptr->floor;
   ptr->size     = -1;
   ptr->buf      = Qnil;
 
@@ -398,6 +407,12 @@ rb_fb_initialize(int argc, VALUE* argv, VALUE self)
 
     // :margin_y
     if (opts[2] != Qundef) ptr->margin_y = FIX2INT(opts[2]);
+
+    // :ceil
+    if (opts[3] != Qundef) ptr->ceil = NUM2DBL(opts[3]);
+
+    // :floor
+    if (opts[4] != Qundef) ptr->floor = NUM2DBL(opts[4]);
   }
 
   ptr->width  = FIX2INT(width);
@@ -407,6 +422,8 @@ rb_fb_initialize(int argc, VALUE* argv, VALUE self)
   ptr->size   = ptr->stride * (ptr->height + ptr->margin_y);
   ptr->buf    = rb_str_buf_new(ptr->size);
 
+  ptr->range  = ptr->ceil - ptr->floor;
+
   /*
    * clear buffer
    */
@@ -456,16 +473,15 @@ rb_fb_to_s(VALUE self)
 }
 
 static VALUE
-rb_fb_put_column(VALUE self, VALUE col, VALUE dat)
+rb_fb_draw_power(VALUE self, VALUE col, VALUE dat)
 {
   rb_fb_t* ptr;
   uint8_t* p;
-  uint8_t r;
-  uint8_t g;
-  uint8_t b;
+  uint8_t* src;
+  double x;
+  int v;
   int i;
   int j;
-  int k;
 
   /*
    * extract context data
@@ -476,37 +492,110 @@ rb_fb_put_column(VALUE self, VALUE col, VALUE dat)
    * check argument
    */
   Check_Type(col, T_FIXNUM);
-  Check_Type(dat, T_ARRAY);
+  Check_Type(dat, T_STRING);
 
   if (FIX2INT(col) < 0 || FIX2INT(col) >= ptr->width) {
     ARGUMENT_ERROR("invalid column number");
   }
 
-  if (RARRAY_LEN(dat) != (ptr->height * 3)) {
+  if (RSTRING_LEN(dat) != (int)((sizeof(double) * ptr->height))) {
     ARGUMENT_ERROR("invalid data length");
   }
 
   /*
    * put pixel data
    */
-  p = (uint8_t*)RSTRING_PTR(ptr->buf) +
-            ((ptr->margin_x + (FIX2INT(col) * ptr->step)) * 3);
-  i = 0;
+  p   = (uint8_t*)RSTRING_PTR(ptr->buf) +
+              ((ptr->margin_x + (FIX2INT(col) * ptr->step)) * 3);
+  src = (uint8_t*)RSTRING_PTR(dat) + (sizeof(double) * (ptr->height - 1));
+
+  for (i = 0; i < ptr->height; i++) {
+    memcpy(&x, src, sizeof(double));
+
+    v = round(x * 3.5);
 
-  for (j = 0; j < ptr->height; j++) {
-    r = FIX2ULONG(rb_ary_entry(dat, i++)) & 0xff;
-    g = FIX2ULONG(rb_ary_entry(dat, i++)) & 0xff;
-    b = FIX2ULONG(rb_ary_entry(dat, i++)) & 0xff;
+    if (v < 0) {
+      v = 0;
+
+    } else if (v > 255.0) {
+      v = 255;
+    }
+
+    for (j = 0; j < ptr->step; j++) {
+      p[0] = v / 3;
+      p[1] = v;
+      p[2] = v / 2;
+
+      p += 3;
+    }
 
-    for (k = 0; k < ptr->step; k++) {
-      p[0] = r;
-      p[1] = g;
-      p[2] = b;
+    p   += (ptr->stride - (j * 3));
+    src -= sizeof(double);
+  }
+
+  return self;
+}
+
+static VALUE
+rb_fb_draw_amplitude(VALUE self, VALUE col, VALUE dat)
+{
+  rb_fb_t* ptr;
+  uint8_t* p;
+  uint8_t* src;
+  double x;
+  int v;
+  int i;
+  int j;
+
+  /*
+   * extract context data
+   */
+  TypedData_Get_Struct(self, rb_fb_t, &fb_data_type, ptr);
+
+  /*
+   * check argument
+   */
+  Check_Type(col, T_FIXNUM);
+  Check_Type(dat, T_STRING);
+
+  if (FIX2INT(col) < 0 || FIX2INT(col) >= ptr->width) {
+    ARGUMENT_ERROR("invalid column number");
+  }
+
+  if (RSTRING_LEN(dat) != (int)((sizeof(double) * ptr->height))) {
+    ARGUMENT_ERROR("invalid data length");
+  }
+
+  /*
+   * put pixel data
+   */
+  p   = (uint8_t*)RSTRING_PTR(ptr->buf) +
+              ((ptr->margin_x + (FIX2INT(col) * ptr->step)) * 3);
+  src = (uint8_t*)RSTRING_PTR(dat) + (sizeof(double) * (ptr->height - 1));
+
+  for (i = 0; i < ptr->height; i++) {
+    memcpy(&x, src, sizeof(double));
+
+    if (x >= ptr->ceil) {
+      v = 255;
+
+    } else if (x <= ptr->floor) {
+      v = 0;
+
+    } else {
+      v = (uint8_t)((255.0 * (x - ptr->floor)) / ptr->range);
+    }
+
+    for (j = 0; j < ptr->step; j++) {
+      p[0] = v / 3;
+      p[1] = v;
+      p[2] = v / 2;
 
       p += 3;
     }
 
-    p += (ptr->stride - (k * 3));
+    p   += (ptr->stride - (j * 3));
+    src -= sizeof(double);
   }
 
   return self;
@@ -680,7 +769,8 @@ Init_fb()
   rb_define_method(fb_klass, "width", rb_fb_width, 0);
   rb_define_method(fb_klass, "height", rb_fb_height, 0);
   rb_define_method(fb_klass, "to_s", rb_fb_to_s, 0);
-  rb_define_method(fb_klass, "put_column", rb_fb_put_column, 2);
+  rb_define_method(fb_klass, "draw_power", rb_fb_draw_power, 2);
+  rb_define_method(fb_klass, "draw_amplitude", rb_fb_draw_amplitude, 2);
   rb_define_method(fb_klass, "hline", rb_fb_hline, 2);
   rb_define_method(fb_klass, "vline", rb_fb_vline, 2);
 

data/ext/wavspa/fft/fft.c

@@ -776,9 +776,15 @@ fft_calc_spectrum(fft_t* fft, double* dst)
   int j;
   double* a;
   double v;
+  double base;
   lc_t* lc;
 
   do {
+    /*
+     * initialize
+     */
+    ret = 0;
+
     /*
      * argument check
      */
@@ -795,20 +801,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;
 
       for(j = 0, a = fft->a + (lc->pos * 2); j < lc->n; j++, a += 2) {
-        v += (10 * log10((a[0] * a[0]) + (a[1] * a[1])));
+        //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]));
       }
 
       dst[i] = v / j;
     }
-
-    /*
-     * mark success
-     */
-    ret = 0;
   } while(0);
 
   return ret;

data/ext/wavspa/fft/rb_fft.c

@@ -348,6 +348,8 @@ rb_fft_spectrum(VALUE self)
   rb_fft_t* ptr;
   VALUE ret;
   int err;
+  int i;
+  double* dat;
 
   /*
    * strip object
@@ -361,9 +363,10 @@ rb_fft_spectrum(VALUE self)
   rb_str_set_len(ret, sizeof(double) * ptr->fft->width);
 
   /*
-   * call inverse function
+   * call transform function
    */
-  err = fft_calc_spectrum(ptr->fft, (double*)RSTRING_PTR(ret));
+  dat = RSTRING_PTR(ret);
+  err = fft_calc_spectrum(ptr->fft, dat);
   if (err) {
     RUNTIME_ERROR( "fft_calc_spectrum() failed. [err = %d]\n", err);
   }

data/lib/wavspa/version.rb

@@ -1,3 +1,3 @@
 module WavSpectrumAnalyzer
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/wavspa/wavfft/main.rb

@@ -19,25 +19,28 @@ module WavSpectrumAnalyzer
 
     class << self
       def load_param(param)
-        @unit_time    = param[:unit_time]
-        @fft_size     = param[:fft_size]
-        @output_width = param[:output_width]
-        @win_func     = param[:window_function]
-
-        @freq_range   = param[:range]
-        @scale_mode   = param[:scale_mode]
-        @logscale     = (param[:scale_mode] == :LOGSCALE)
-        @col_step     = param[:col_step]
-
-        @basis_freq   = param[:basis_freq] || 440.0 
-        @grid_step    = param[:grid_step] || ((@logscale)? 2.0: 2000.0)
-
-        @lo_freq      = @freq_range[0]
-        @hi_freq      = @freq_range[1]
-        @freq_width   = (@hi_freq - @lo_freq)
-
-        @log_step     = (@hi_freq / @lo_freq) ** (1.0 / @output_width)
-        @log_base     = Math.log(@log_step)
+        @transform_mode = param[:transform_mode]
+        @unit_time      = param[:unit_time]
+        @fft_size       = param[:fft_size]
+        @output_width   = param[:output_width]
+        @win_func       = param[:window_function]
+                       
+        @freq_range     = param[:range]
+        @ceil           = param[:ceil]
+        @floor          = param[:floor]
+        @col_step       = param[:col_step]
+                       
+        @scale_mode     = param[:scale_mode]
+        @logscale       = (param[:scale_mode] == :LOGSCALE)
+        @basis_freq     = param[:basis_freq] || 440.0 
+        @grid_step      = param[:grid_step] || ((@logscale)? 2.0: 2000.0)
+                       
+        @lo_freq        = @freq_range[0]
+        @hi_freq        = @freq_range[1]
+        @freq_width     = (@hi_freq - @lo_freq)
+                       
+        @log_step       = (@hi_freq / @lo_freq) ** (1.0 / @output_width)
+        @log_base       = Math.log(@log_step)
       end
       private :load_param
 
@@ -52,7 +55,6 @@ module WavSpectrumAnalyzer
         fft.scale_mode = @scale_mode
         fft.frequency  = @freq_range.clone.unshift(wav.sample_rate)
 
-        line  = []
         rows  = 0
         usize = (wav.sample_rate / 100) * @unit_time
         nblk  = (wav.data_size / (wav.sample_size / 8)) / usize
@@ -61,7 +63,9 @@ module WavSpectrumAnalyzer
                                 @output_width,
                                 :column_step => @col_step,
                                 :margin_x => ($draw_freq_line)? 50:0,
-                                :margin_y => ($draw_time_line)? 30:0)
+                                :margin_y => ($draw_time_line)? 30:0,
+                                :ceil => @ceil,
+                                :floor => @floor)
 
         if $verbose
           STDERR.print <<~EOT
@@ -83,6 +87,9 @@ module WavSpectrumAnalyzer
                 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
@@ -97,20 +104,11 @@ module WavSpectrumAnalyzer
 
           fft << wav.read(usize)
 
-          fft.spectrum.unpack("d*").each {|x|
-            begin
-              x = (x * 3.5).round 
-              x = 0 if x < 0 
-              x = 255 if x > 255
-            rescue
-              x = 0
-            end
-
-            line.unshift(x / 3, x, x / 2)
-          }
-
-          fb.put_column(rows, line)
-          line.clear
+          if @transfer_mode == :POWER
+            fb.draw_power(rows, fft.spectrum)
+          else
+            fb.draw_amplitude(rows, fft.amplitude)
+          end
 
           rows += 1
         end

data/lib/wavspa/wavfft/preset.rb

@@ -16,7 +16,10 @@ module WavSpectrumAnalyzer
         :output_width    => 240,
         :window_function => :FLAT_TOP,
         :scale_mode      => :LOGSCALE,
-        :range            => [200, 8000],
+        :transform_mode  => :POWER,
+        :range           => [200, 8000],
+        :ceil            => -10.0,
+        :floor           => -90.0,
         :col_step        => 1,
       },
 
@@ -26,7 +29,10 @@ module WavSpectrumAnalyzer
         :output_width    => 360,
         :window_function => :FLAT_TOP,
         :scale_mode      => :LOGSCALE,
-        :range            => [200, 16000],
+        :transform_mode  => :POWER,
+        :range           => [200, 16000],
+        :ceil            => -10.0,
+        :floor           => -90.0,
         :col_step        => 1,
       },
 
@@ -36,7 +42,10 @@ module WavSpectrumAnalyzer
         :output_width    => 480,
         :window_function => :FLAT_TOP,
         :scale_mode      => :LOGSCALE,
-        :range            => [50, 22000],
+        :transform_mode  => :POWER,
+        :range           => [50, 22000],
+        :ceil            => -10.0,
+        :floor           => -90.0,
         :col_step        => 1,
       },
 
@@ -46,7 +55,10 @@ module WavSpectrumAnalyzer
         :window_function => :FLAT_TOP,
         :output_width    => 640,
         :scale_mode      => :LOGSCALE,
+        :transform_mode  => :POWER,
         :range           => [200, 32000],
+        :ceil            => -10.0,
+        :floor           => -90.0,
         :col_step        => 1,
       },
     }

data/lib/wavspa/wavlet/main.rb

@@ -19,27 +19,27 @@ module WavSpectrumAnalyzer
 
     class << self
       def load_param(param)
-        @unit_time    = param[:unit_time]
-        @sigma        = param[:sigma]
-        @ceil         = param[:ceil]
-        @floor        = param[:floor]
-        @tran_mode    = param[:transform_mode]
-        @output_width = param[:output_width]
-
-        @freq_range   = param[:range]
-        @scale_mode   = param[:scale_mode]
-        @logscale     = (param[:scale_mode] == :LOGSCALE)
-        @col_step     = param[:col_step]
-
-        @basis_freq   = param[:basis_freq] || 440.0 
-        @grid_step    = param[:grid_step] || ((@logscale)? 2.0: 2000.0)
-
-        @lo_freq      = @freq_range[0]
-        @hi_freq      = @freq_range[1]
-        @freq_width   = (@hi_freq - @lo_freq)
-
-        @log_step     = (@hi_freq / @lo_freq) ** (1.0 / @output_width)
-        @log_base     = Math.log(@log_step)
+        @transform_mode = param[:transform_mode]
+        @unit_time      = param[:unit_time]
+        @sigma          = param[:sigma]
+        @output_width   = param[:output_width]
+                       
+        @freq_range     = param[:range]
+        @ceil           = param[:ceil]
+        @floor          = param[:floor]
+        @col_step       = param[:col_step]
+                       
+        @scale_mode     = param[:scale_mode]
+        @logscale       = (param[:scale_mode] == :LOGSCALE)
+        @basis_freq     = param[:basis_freq] || 440.0 
+        @grid_step      = param[:grid_step] || ((@logscale)? 2.0: 2000.0)
+                       
+        @lo_freq        = @freq_range[0]
+        @hi_freq        = @freq_range[1]
+        @freq_width     = (@hi_freq - @lo_freq)
+                       
+        @log_step       = (@hi_freq / @lo_freq) ** (1.0 / @output_width)
+        @log_base       = Math.log(@log_step)
       end
       private :load_param
 
@@ -57,9 +57,7 @@ module WavSpectrumAnalyzer
 
         wl.put_in("s%dle" % wav.sample_size, wav.read)
 
-        line  = []
-        rows  = 0
-
+        row   = 0
         usize = (wav.sample_rate * @unit_time) / 1000
         nblk  = (wav.data_size / wav.block_size) / usize
 
@@ -67,7 +65,9 @@ module WavSpectrumAnalyzer
                                 @output_width,
                                 :column_step => @col_step,
                                 :margin_x => ($draw_freq_line)? 50:0,
-                                :margin_y => ($draw_time_line)? 30:0)
+                                :margin_y => ($draw_time_line)? 30:0,
+                                :ceil => @ceil,
+                                :floor => @floor)
 
         if $verbose
           STDERR.print <<~EOT
@@ -79,18 +79,18 @@ module WavSpectrumAnalyzer
                 sample size: #{wav.sample_size} bits
                 data rate:   #{wav.bytes_per_sec} bytes/sec
 
-            - FFT parameter
+            - WAVELET parameter
                 sigma:       #{@sigma}
                 unit time:   #{@unit_time} ms
-                ceil:        #{@ceil}
-                floor:       #{@floor}
-                mode :       #{@tran_mode}
 
             - 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}
 
           EOT
         end
@@ -100,28 +100,17 @@ module WavSpectrumAnalyzer
                 "(support only monoral data).")
         end
        
-        until rows >= nblk
-          STDERR.printf("\rtransform #{rows + 1}/#{nblk}", rows) if $verbose
-          wl.transform(rows * usize)
-
-          result = (@transform_mode == :POWER)? wl.power: wl.amplitude
-
-          result.unpack("d*").each {|x|
-            if x > @ceil
-              x = 255
-            elsif x < @floor
-              x = 0
-            else
-              x = ((255 * (x - @floor)) / (@ceil - @floor)).floor
-            end
-
-            line.unshift(x / 3, x, x / 2)
-          }
+        until row >= nblk
+          STDERR.printf("\rtransform #{row + 1}/#{nblk}", row) if $verbose
+          wl.transform(row * usize)
 
-          fb.put_column(rows, line)
-          line.clear
+          if @transform_mode == :POWER
+            fb.draw_power(row, wl.power)
+          else
+            fb.draw_amplitude(row, wl.amplitude)
+          end
 
-          rows += 1
+          row += 1
         end
 
         STDERR.printf(" ... done\n") if $verbose

data/wavspa.gemspec

@@ -43,5 +43,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_dependency "libpng-ruby", "~> 0.5.2"
+  spec.add_dependency "libpng-ruby", "~> 0.5.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavspa
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Hirosho Kuwagata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-02 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.4
 description: spectrum analyzer for wav file.
 email:
 - kgt9221@gmail.com