Changeset e83dd0e

Timestamp:

Apr 18, 2007, 1:19:46 PM (18 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:

05468516

Parents:

5507e9d (diff), 970ef94 (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 pomme branch

Files:

• INSTALL (deleted)
• src/mathutils.c (modified) (1 diff)
• src/mathutils.h (modified) (1 diff)
• swig/aubio.i (modified) (1 diff)

src/mathutils.c

@@ -458 +458 @@
 }
 
+smpl_t aubio_spectral_centroid(cvec_t * spectrum, smpl_t samplerate) {
+  uint_t i=0, j;
+  smpl_t sum = 0., sc = 0.;
+  for ( j = 0; j < spectrum->length; j++ ) {
+    sum += spectrum->norm[i][j];
+  }
+  if (sum == 0.) return 0.;
+  for ( j = 0; j < spectrum->length; j++ ) {
+    sc += (smpl_t)j * spectrum->norm[i][j];
+  }
+  return sc / sum * samplerate / (smpl_t)(spectrum->length);
+}
+
 void aubio_autocorr(fvec_t * input, fvec_t * output){
         uint_t i = 0, j = 0, length = input->length;

src/mathutils.h

@@ -209 +209 @@
 smpl_t aubio_zero_crossing_rate(fvec_t * input);
 /**
+ * spectrum centroid computed on a cvec
+ */
+smpl_t aubio_spectral_centroid(cvec_t * input, smpl_t samplerate);
+/**
  * clean up cached memory at the end of program
  *

swig/aubio.i

@@ -147 +147 @@
 void aubio_autocorr(fvec_t * in, fvec_t * acf);
 smpl_t aubio_zero_crossing_rate(fvec_t * input);
+smpl_t aubio_spectral_centroid(cvec_t * spectrum, smpl_t samplerate);
 
 /* scale */