comparison examples/puredata/xtract~.c @ 42:84e69b155098

Numerous fixes, see ChangeLog

 */
 
 /* calculates the spectral xtract of one frame, given peak frequency and amplitude to first and second inputs respectively */
 
 #include "m_pd.h"
+#include <math.h>
 
 #define XTRACT 
 #include "xtract/libxtract.h"
 
 #define BLOCKSIZE 1024

 
     return_code = xtract[x->feature]((float *)in, N, x->argv, &result);
 
     if(return_code == FEATURE_NOT_IMPLEMENTED)
 	pd_error(x, "Feature not implemented");
+
+    /* set nan, inf or -inf to 0 */
+    result = (isinf(result) || isnan(result) ? 0 : result);
     
     outlet_float(x->x_obj.ob_outlet, result);
     return (w+4);
 }
 

 	case  AVERAGE_DEVIATION:
 	case  ROLLOFF:
 	case  INHARMONICITY:
 	case  LOWEST_MATCH:
 	case  F0:
+	case  TONALITY:
 	    floatargs = 1;
 	    break;
 	case  SKEWNESS:
 	case  KURTOSIS:
 	case  PEAKS:

 	case  SMOOTHNESS:
 	case  SPREAD:
 	case  ZCR:
 	case  LOUDNESS:
 	case  FLATNESS:
-	case  TONALITY:
 	case  CREST:
 	case  NOISINESS:
 	case  RMS_AMPLITUDE:
 	case  POWER:
 	case  ODD_EVEN_RATIO:

     if(x->feature == MFCC){
 	x->memory.argv = (size_t)(sizeof(xtract_mel_filter));
 	x->argv = (xtract_mel_filter *)getbytes(x->memory.argv);
     }
     else if(x->feature == BARK_COEFFICIENTS){
-	x->memory.argv = (size_t)(sizeof(BARK_BANDS * sizeof(t_int)));
+	x->memory.argv = (size_t)(BARK_BANDS * sizeof(t_int));
         x->argv = (t_int *)getbytes(x->memory.argv);
     }
     else if (floatargs){
 	x->memory.argv = (size_t)(floatargs * sizeof(t_float));
 	x->argv = (t_float *)getbytes(x->memory.argv);