Changeset 70585a5

Timestamp:

Nov 21, 2007, 4:53:13 PM (17 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:

66a1b955

Parents:

b050e8e (diff), 15b97d9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge from main branch

Files:

• .bzrignore (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• examples/aubioonset.c (modified) (2 diffs)
• examples/utils.c (modified) (4 diffs)
• examples/utils.h (modified) (1 diff)
• src/fft.c (modified) (4 diffs)
• src/onsetdetection.c (modified) (1 diff)
• src/onsetdetection.h (modified) (1 diff)
• src/pitchyinfft.c (modified) (1 diff)
• swig/aubio.i (modified) (1 diff)
• tests/src/Makefile.am (modified) (1 diff)
• tests/src/test-fft.c (modified) (1 diff)
• tests/src/test-mfft.c (deleted)

.bzrignore

@@ -5 +5 @@
 **/*.lo
 **/*.la
+
+# gcov generated files
+**/*.gcno
+**/*.gcda
 
 # ignore compiled examples
@@ -34 +38 @@
 configure
 depcomp
+mkinstalldirs
 install-sh
 libtool

Makefile.am

@@ -36 +36 @@
 uninstall-hook: uninstall-pkgconfig
 
+lcov: all
+        mkdir -p $(top_builddir)/lcov
+        lcov --directory $(top_builddir) --output-file $(top_builddir)/lcov/aubio.info --compat-libtool --zerocounters
+        cd tests/python && ./run_all_tests -v || echo "some tests failed"
+        lcov --directory $(top_builddir) --output-file $(top_builddir)/lcov/aubio.info --compat-libtool --capture
+        genhtml --output-directory $(top_builddir)/lcov $(top_builddir)/lcov/aubio.info 

configure.ac

@@ -35 +35 @@
 dnl Enable debugging (no)
 AC_ARG_ENABLE(debug,
-  [  --enable-debug[[=value]]  compile with debug [[default=no]]],
+  AC_HELP_STRING([--enable-debug],[compile in debug mode [[default=no]]]),
   with_debug="yes",
   with_debug="no")
@@ -46 +46 @@
 dnl Enable full warnings (yes)
 AC_ARG_ENABLE(warnings,
-  [  --enable-warnings[[=value]] compile with all gcc warnings [[default=yes]]],
+  AC_HELP_STRING([--enable-warnings],[compile with all gcc warnings [[default=yes]]]),
   with_warnme="no",
   with_warnme="yes")
@@ -67 +67 @@
 fi
 
+dnl fail on compilation warnings 
 AC_ARG_ENABLE(errorfail,
-  [  --enable-errorfail[[=value]]  fail on compilation warnings [[default=no]]],
+  AC_HELP_STRING([--enable-errorfail],[fail on compilation warnings [[default=no]]]),
   AUBIO_CFLAGS="$AUBIO_CFLAGS -Werror -Wmissing-prototypes -Wmissing-declarations -Wno-unused-parameter",
-  with_warnme="no")
+  with_errorfail="no")
+
+dnl add gcov/lcov profiling and coverage flags
+AC_ARG_ENABLE(lcov,
+  AC_HELP_STRING([--enable-lcov],[compile with gcov/lcov profiling flags [[default=no]]]),
+  AUBIO_CFLAGS="$AUBIO_CFLAGS -fprofile-arcs -ftest-coverage",
+  with_lcov="no")
 
 dnl Check for libtool

examples/aubioonset.c

@@ -72 +72 @@
       if (isonset && output_filename == NULL) {
         if(frames >= 4) {
-          outmsg("%f\n",(frames-4)*overlap_size/(float)samplerate);
-        } else if (frames < 4) {
+          outmsg("%f\n",(frames-frames_delay)*overlap_size/(float)samplerate);
+        } else if (frames < frames_delay) {
           outmsg("%f\n",0.);
         }
@@ -80 +80 @@
 
 int main(int argc, char **argv) {
+  frames_delay = 4;
   examples_common_init(argc,argv);
   examples_common_process(aubio_process,process_print);

examples/utils.c

@@ -22 +22 @@
 void save_data (void);
 void restore_data(lash_config_t * lash_config);
+void flush_process(aubio_process_func_t process_func, aubio_print_func_t print);
 pthread_t lash_thread;
 #endif /* LASH_SUPPORT */
@@ -33 +34 @@
 int usejack = 0;
 int usedoubled = 1;
+int frames_delay = 0;
 
 
@@ -395 +397 @@
 
     debug("Processed %d frames of %d samples.\n", frames, buffer_size);
+
+    flush_process(process_func, print);
     del_aubio_sndfile(file);
 
@@ -403 +407 @@
 }
 
+void flush_process(aubio_process_func_t process_func, aubio_print_func_t print){
+  uint i,j;
+  for (i = 0; i < channels; i++) {
+    for (j = 0; j < obuf->length; j++) {
+      fvec_write_sample(obuf,0.,i,j);
+    }
+  }
+  for (i = 0; (signed)i < frames_delay; i++) {
+    process_func(ibuf->data, obuf->data, overlap_size);
+    print(); 
+  }
+}
 
 

examples/utils.h

@@ -42 +42 @@
 extern int usejack;
 extern int usedoubled;
+extern int frames_delay;
 extern unsigned int median;
 extern const char * output_filename;

src/fft.c

@@ -46 +46 @@
   uint_t fft_size;
   real_t *in, *out;
-  fftw_plan   pfw, pbw;
+  fftw_plan pfw, pbw;
   fft_data_t * specdata;     /* complex spectral data */
   fvec_t * compspec;
@@ -61 +61 @@
   /* create plans */
 #ifdef HAVE_COMPLEX_H
-  s->fft_size = winsize/2+1;
+  s->fft_size = winsize/2 + 1;
   s->specdata = (fft_data_t*)fftw_malloc(sizeof(fft_data_t)*s->fft_size);
   s->pfw = fftw_plan_dft_r2c_1d(winsize, s->in,  s->specdata, FFTW_ESTIMATE);
@@ -102 +102 @@
     }
     fftw_execute(s->pfw);
-#if HAVE_COMPLEX_H
+#ifdef HAVE_COMPLEX_H
     compspec->data[i][0] = REAL(s->specdata[0]);
     for (j = 1; j < s->fft_size -1 ; j++) {
@@ -121 +121 @@
   const smpl_t renorm = 1./(smpl_t)s->winsize;
   for (i = 0; i < compspec->channels; i++) {
-#if HAVE_COMPLEX_H
+#ifdef HAVE_COMPLEX_H
     s->specdata[0] = compspec->data[i][0];
     for (j=1; j < s->fft_size - 1; j++) {

src/onsetdetection.c

@@ -284 +284 @@
 }
 
-void aubio_onsetdetection_free (aubio_onsetdetection_t *o){
-  del_aubio_onsetdetection(o);
-}
-
 void del_aubio_onsetdetection (aubio_onsetdetection_t *o){
 

src/onsetdetection.h

@@ -161 +161 @@
 */
 void del_aubio_onsetdetection(aubio_onsetdetection_t *o);
-/** deletion of an onset detection object (obsolete)
-
-  \param o onset detection object as returned by new_aubio_onsetdetection()
-
-*/
-void aubio_onsetdetection_free(aubio_onsetdetection_t *o);
-
 
 #ifdef __cplusplus

src/pitchyinfft.c

@@ -138 +138 @@
     }
   } else
-    return 0;
+    return 0.;
 }
 

swig/aubio.i

@@ -178 +178 @@
 aubio_onsetdetection_t * new_aubio_onsetdetection(aubio_onsetdetection_type type, uint_t size, uint_t channels);
 void aubio_onsetdetection(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset);
-void aubio_onsetdetection_free(aubio_onsetdetection_t *o);
 
 /* should these still be exposed ? */

tests/src/Makefile.am

@@ -7 +7 @@
 bin_PROGRAMS = \
         test-fft \
-        test-mfft \
         test-hist \
         test-scale \

tests/src/test-fft.c

@@ -1 @@
-#include <stdlib.h>
-#include <math.h>
-#include <complex.h>
+
 #include <aubio.h>
 
-#define NEW_ARRAY(_t,_n)                (_t*)malloc((_n)*sizeof(_t))
-
-
 int main(){
-        uint_t i,j;
-        uint_t win_s      = 1024;                       // window size
-        uint_t channels   = 1;                          // number of channel
-        fvec_t * in       = new_fvec (win_s, channels); // input buffer
-        cvec_t * fftgrain = new_cvec (win_s, channels); // fft norm and phase
-        fvec_t * out      = new_fvec (win_s, channels); // output buffer
-  
-        // allocate fft and other memory space
-        aubio_fft_t * fft      = new_aubio_fft(win_s);    // fft interface
-        smpl_t * w             = NEW_ARRAY(smpl_t,win_s); // window
-        // complex spectral data
-        fft_data_t ** spec     = NEW_ARRAY(fft_data_t*,channels); 
-        for (i=0; i < channels; i++)
-                spec[i] = NEW_ARRAY(fft_data_t,win_s);
-        // initialize the window (see mathutils.c)
-        aubio_window(w,win_s,aubio_win_hanningz);
-  
-        // fill input with some data
-        in->data[0][win_s/2] = 1;
-  
-        // execute stft
-        for (i=0; i < channels; i++) {
-                aubio_fft_do (fft,in->data[i],spec[i],win_s);
-                // put norm and phase into fftgrain
-                aubio_fft_getnorm(fftgrain->norm[i], spec[i], win_s/2+1);
-                aubio_fft_getphas(fftgrain->phas[i], spec[i], win_s/2+1);
-        }
-  
-        // execute inverse fourier transform
-        for (i=0; i < channels; i++) {
-                for (j=0; j<win_s/2+1; j++) {
-                        spec[i][j]  = cexp(I*aubio_unwrap2pi(fftgrain->phas[i][j]));
-                        spec[i][j] *= fftgrain->norm[i][j];
-                }
-                aubio_fft_rdo(fft,spec[i],out->data[i],win_s);
-        }
-
+        /* allocate some memory */
+        uint_t win_s      = 4096;                       /* window size        */
+        uint_t channels   = 100;                        /* number of channels */
+        fvec_t * in       = new_fvec (win_s, channels); /* input buffer       */
+        cvec_t * fftgrain = new_cvec (win_s, channels); /* fft norm and phase */
+        fvec_t * out      = new_fvec (win_s, channels); /* output buffer      */
+        /* allocate fft and other memory space */
+        aubio_fft_t * fft = new_aubio_fft(win_s,channels);
+        /* fill input with some data */
+        //printf("initialised\n");
+        /* execute stft */
+        aubio_fft_do (fft,in,fftgrain);
+        //printf("computed forward\n");
+        /* execute inverse fourier transform */
+        aubio_fft_rdo(fft,fftgrain,out);
+        //printf("computed backard\n");
+        del_aubio_fft(fft);
         del_fvec(in);
+        del_cvec(fftgrain);
         del_fvec(out);
-        del_cvec(fftgrain);
-        free(w);
-        del_aubio_fft(fft);
-        for (i=0; i < channels; i++)
-                free(spec[i]);
-        free(spec); 
+        //printf("memory freed\n");
         aubio_cleanup();
         return 0;