Changes in tests/src/spectral/test-tss.c [9d6001cb:6938a20]

File:

• tests/src/spectral/test-tss.c (modified) (2 diffs)

tests/src/spectral/test-tss.c ¶

@@ -1 @@
-/* test sample for phase vocoder 
- *
- * this program should start correctly using JACK_START_SERVER=true and
- * reconstruct each audio input frame perfectly on the corresponding input with
- * a delay equal to the window size, hop_s.
- */
-
-#include <stdio.h>
-#define AUBIO_UNSTABLE 1
 #include <aubio.h>
 
-int main(){
-  int i;
-  uint_t win_s    = 1024; /* window size                       */
-  uint_t hop_s    = 256;  /* hop size                          */
+int main ()
+{
+  uint_t n = 10; // compute n times
+  uint_t win_s = 1024; // window size
+  uint_t hop_s = 256;  // hop size
 
-  /* allocate some memory */
-  fvec_t * in       = new_fvec (hop_s); /* input buffer       */
-  cvec_t * fftgrain = new_cvec (win_s); /* fft norm and phase */
-  cvec_t * cstead   = new_cvec (win_s); /* fft norm and phase */
-  cvec_t * ctrans   = new_cvec (win_s); /* fft norm and phase */
-  fvec_t * stead    = new_fvec (hop_s); /* output buffer      */
-  fvec_t * trans    = new_fvec (hop_s); /* output buffer      */
-  /* allocate phase vocoders and transient steady-state separation */
+  // create some vectors
+  fvec_t * in       = new_fvec (hop_s); // input buffer
+  cvec_t * fftgrain = new_cvec (win_s); // fft norm and phase
+  cvec_t * cstead   = new_cvec (win_s); // fft norm and phase
+  cvec_t * ctrans   = new_cvec (win_s); // fft norm and phase
+  fvec_t * stead    = new_fvec (hop_s); // output buffer
+  fvec_t * trans    = new_fvec (hop_s); // output buffer
+
+  // create phase vocoder for analysis of input signal 
   aubio_pvoc_t * pv = new_aubio_pvoc (win_s,hop_s);
+  // create transient/steady-state separation object
+  aubio_tss_t *  tss = new_aubio_tss(win_s,hop_s);
+  // create phase vocoder objects for synthesis of output signals
   aubio_pvoc_t * pvt = new_aubio_pvoc(win_s,hop_s);
   aubio_pvoc_t * pvs = new_aubio_pvoc(win_s,hop_s);
-  aubio_tss_t *  tss = new_aubio_tss(win_s,hop_s);
-
-  /* fill input with some data */
-  printf("initialised\n");
 
   /* execute stft */
-  for (i = 0; i < 10; i++) {
-    aubio_pvoc_do (pv,in,fftgrain);
-    aubio_tss_do  (tss,fftgrain,ctrans,cstead);
-    aubio_pvoc_rdo(pvt,cstead,stead);
-    aubio_pvoc_rdo(pvs,ctrans,trans);
+  while ( n-- ) {
+    // fftgrain = pv(in)
+    aubio_pvoc_do (pv, in, fftgrain);
+    // ctrans, cstead = tss (fftgrain)
+    aubio_tss_do (tss, fftgrain, ctrans, cstead);
+    // stead = pvt_inverse (cstead)
+    // trans = pvt_inverse (ctrans)
+    aubio_pvoc_rdo (pvt, cstead, stead);
+    aubio_pvoc_rdo (pvs, ctrans, trans);
   }
 
@@ -50 +46 @@
   del_fvec(stead);
   del_fvec(trans);
+
   aubio_cleanup();
-  printf("memory freed\n");
+
   return 0;
 }