Changeset 8a5148e

Timestamp:

Feb 22, 2014, 8:00:02 PM (11 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

687eead

Parents:

4c0a1db

Message:

src/spectral/phasevoc.c: improve, accept that hop_s == buf_s

File:

• src/spectral/phasevoc.c (modified) (4 diffs)

src/spectral/phasevoc.c

@@ -31 +31 @@
   uint_t hop_s;       /** overlap step */
   aubio_fft_t * fft;  /** fft object */
-  fvec_t * synth;     /** cur output grain [win_s] */
-  fvec_t * synthold;  /** last input frame [win_s-hop_s] */
-  fvec_t * data;      /** current input grain [win_s] */
-  fvec_t * dataold;   /** last input frame [win_s-hop_s] */
+  fvec_t * data;      /** current input grain, [win_s] frames */
+  fvec_t * dataold;   /** memory of past grain, [win_s-hop_s] frames */
+  fvec_t * synth;     /** current output grain, [win_s] frames */
+  fvec_t * synthold;  /** memory of past grain, [win_s-hop_s] frames */
   fvec_t * w;         /** grain window [win_s] */
 };
@@ -81 +81 @@
     AUBIO_ERR("got buffer_size %d, but can not be < 2\n", win_s);
     goto beach;
-  } else if (win_s < hop_s + 1) {
-    AUBIO_ERR("hop size (%d) is larger than or equal to win size (%d)\n", win_s, hop_s);
+  } else if (win_s < hop_s) {
+    AUBIO_ERR("hop size (%d) is larger than win size (%d)\n", win_s, hop_s);
     goto beach;
   }
@@ -93 +93 @@
 
   /* new input output */
-  pv->dataold  = new_fvec  (win_s-hop_s);
-  pv->synthold = new_fvec (win_s-hop_s);
+  if (win_s > hop_s) {
+    pv->dataold  = new_fvec  (win_s-hop_s);
+    pv->synthold = new_fvec (win_s-hop_s);
+  } else {
+    pv->dataold  = new_fvec  (1);
+    pv->synthold = new_fvec (1);
+  }
   pv->w        = new_aubio_window ("hanningz", win_s);
 
@@ -141 +146 @@
                 smpl_t * synthnew, uint_t win_s, uint_t hop_s)
 {
-  uint_t i;
-  smpl_t scale = 2 * hop_s / (win_s + .0);
-  /* add new synth to old one and put result in synthnew */
+  uint_t i, start;
+  smpl_t scale = hop_s * 2. / win_s;
+
+  /* put new result in synthnew */
   for (i = 0; i < hop_s; i++)
-    synthnew[i] = synthold[i] + synth[i] * scale;
+    synthnew[i] = synth[i] * scale;
+  /* no overlap, nothing else to do */
+  if (win_s <= hop_s) return;
+
+  /* add new synth to old one and */
+  for (i = 0; i < hop_s; i++)
+    synthnew[i] += synthold[i];
+
   /* shift synthold */
-  for (i = 0; i < win_s - 2 * hop_s; i++)
-    synthold[i] = synthold[i + hop_s];
+  for (i = hop_s; i < win_s - hop_s; i++)
+    synthold[i - hop_s] = synthold[i];
+
+  /* more than 50% overlap, overlap anyway */
+  if (win_s < 2 * hop_s) start = 0;
+  /* less than 50% overlap, reset latest grain trail */
+  else start = win_s - hop_s - hop_s;
   /* erase last frame in synthold */
-  for (i = win_s - hop_s; i < win_s; i++)
-    synthold[i - hop_s] = 0.;
+  for (i = start; i < win_s - hop_s; i++)
+    synthold[i] = 0.;
+
   /* additive synth */
   for (i = 0; i < win_s - hop_s; i++)