comparison examples/puredata/xtract~.c @ 161:246c203cc733

Add wavelet-based pitch tracker

     t_xtract_tilde *x = (t_xtract_tilde *)(w[2]);
     t_int N = (t_int)(w[3]);
     t_int rv = 0;
     double result = 0.0;
 
-    for(n = 0; n < N; ++n) {
+    for(t_int n = 0; n < N; ++n) {
         x->data[n] = (double)in[n];
     }
 
     rv = xtract[x->feature](x->data, N, x->argv, &result);
 

     t_xtract_tilde *x = (t_xtract_tilde *)pd_new(xtract_class);
     xtract_mel_filter *mf;
     t_int n, N, M, f, F, 
           n_args, 
           type;
-    t_float *argv_max;
+    double *argv_max;
     t_symbol *arg1;
     xtract_function_descriptor_t *fd;
     char *p_name, 
          *p_desc, 
          *author;

     
     /* Adjust frame size if we are using subframe features */
     if(x->is_subframe)
         N = M;
 
-    post("xtract~: window size: %d", N);
+    post("xtract~: assumed window size: %d", N);
 
     /* do init if needed */
     if(x->feature == XTRACT_MFCC){
 
         mf = x->argv;

         mf->n_filters = 20;
         
         post("xtract~: mfcc: filters = %d", 
 		((xtract_mel_filter *)x->argv)->n_filters);
         mf->filters = 
-            (t_float **)getbytes(mf->n_filters * sizeof(t_float *));
+            (double **)getbytes(mf->n_filters * sizeof(double *));
         for(n = 0; n < mf->n_filters; n++)
-            mf->filters[n] = (float *)getbytes(N * sizeof(float));
+            mf->filters[n] = (double *)getbytes(N * sizeof(double));
                  
         xtract_init_mfcc(N, NYQUIST, XTRACT_EQUAL_GAIN, 80.0f,
                 18000.0f, mf->n_filters, mf->filters);
         x->done_init = 1;
     }

     }
     else if(x->feature == XTRACT_WINDOWED){
         x->window = xtract_init_window(N, XTRACT_HANN);
         x->argv = x->window;
         x->done_init = 1;
+    }
+    else if(x->feature == XTRACT_WAVELET_F0){
+        xtract_init_wavelet_f0_state();
     }
 
     /* Initialise fft_plan if required */
     if(x->feature == XTRACT_AUTOCORRELATION_FFT ||
             x->feature == XTRACT_SPECTRUM ||