comparison src/scalar.c @ 161:246c203cc733

Add wavelet-based pitch tracker

 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
 
-#include "../xtract/libxtract.h"
-#include "../xtract/xtract_helper.h"
+#include "dywapitchtrack/dywapitchtrack.h"
+
+#include "xtract/libxtract.h"
+#include "xtract/xtract_helper.h"
 #include "xtract_macros_private.h"
+#include "xtract_globals_private.h"
 
 int xtract_mean(const double *data, const int N, const void *argv, double *result)
 {
 
     int n = N;

 
     return_code = xtract_f0(data, N, argv, result);
 
     if(return_code == XTRACT_NO_RESULT)
     {
-
         sr = *(double *)argv;
         if(sr == 0)
             sr = 44100.0;
         spectrum = (double *)malloc(N * sizeof(double));
         peaks = (double *)malloc(N * sizeof(double));

 
     return XTRACT_SUCCESS;
 
 }
 
+int xtract_wavelet_f0(const double *data, const int N, const void *argv, double *result)
+{
+    double sr = *(double *)argv;
+
+    *result = dywapitch_computepitch(&wavelet_f0_state, data, 0, N);
+
+    if (*result == 0.0)
+    {
+        return XTRACT_NO_RESULT;
+    }
+
+    return XTRACT_SUCCESS;
+}
+
+