Changeset 9d6001cb for tests/src/spectral

Timestamp:

Jul 11, 2012, 12:26:51 AM (12 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:

e7e11bf

Parents:

02418f6

Message:

tests/src: fix memory leaks

Location:

tests/src/spectral

Files:

• test-phasevoc-jack.c (modified) (1 diff)
• test-tss.c (modified) (1 diff)

tests/src/spectral/test-phasevoc-jack.c

@@ -11 +11 @@
 #include <unistd.h>  /* sleep() */
 #include <aubio.h>
+#ifdef HAVE_JACK
 #include "jackio.h"
+#endif /* HAVE_JACK */
 
 uint_t testing  = 0;  /* change this to 1 to listen        */

tests/src/spectral/test-tss.c

@@ -11 +11 @@
 
 int main(){
-        int i;
-        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 fft and other memory space */
-        aubio_pvoc_t * pv = new_aubio_pvoc (win_s,hop_s);
-        aubio_pvoc_t * pvt = new_aubio_pvoc(win_s,hop_s);
-        aubio_pvoc_t * pvs = new_aubio_pvoc(win_s,hop_s);
+  int i;
+  uint_t win_s    = 1024; /* window size                       */
+  uint_t hop_s    = 256;  /* hop size                          */
 
-        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);
-        }
-        del_aubio_pvoc(pv);
-        del_fvec(in);
-        del_cvec(fftgrain);
-        del_cvec(cstead);
-        del_cvec(ctrans);
-        del_fvec(stead);
-        del_fvec(trans);
-        aubio_cleanup();
-        printf("memory freed\n");
-        return 0;
+  /* 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 */
+  aubio_pvoc_t * pv = new_aubio_pvoc (win_s,hop_s);
+  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);
+  }
+
+  del_aubio_pvoc(pv);
+  del_aubio_pvoc(pvt);
+  del_aubio_pvoc(pvs);
+  del_aubio_tss(tss);
+
+  del_fvec(in);
+  del_cvec(fftgrain);
+  del_cvec(cstead);
+  del_cvec(ctrans);
+  del_fvec(stead);
+  del_fvec(trans);
+  aubio_cleanup();
+  printf("memory freed\n");
+  return 0;
 }