Changeset fc6c831

Timestamp:

Nov 24, 2007, 10:47:15 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:

6c7d49b

Parents:

e2da295

Message:

moved spectral_centroid to new file

Location:

src

Files:

• Makefile.am (modified) (2 diffs)
• aubio.h (modified) (3 diffs)
• mathutils.c (modified) (1 diff)
• mathutils.h (modified) (1 diff)
• spectral/spectral_centroid.c (added)
• spectral/spectral_centroid.h (added)

src/Makefile.am

@@ -15 +15 @@
         spectral/fft.h \
         spectral/tss.h \
+        spectral/spectral_centroid.h \
         pitch/pitchdetection.h \
         pitch/pitchmcomb.h \
@@ -58 +59 @@
         spectral/tss.c \
         spectral/tss.h \
+        spectral/spectral_centroid.c \
+        spectral/spectral_centroid.h \
         pitch/pitchdetection.c \
         pitch/pitchdetection.h \

src/aubio.h

@@ -60 +60 @@
 #include "types.h"
 #include "sample.h"
-#include "spectral/fft.h"
-#include "spectral/phasevoc.h"
 #include "mathutils.h"
 #include "utils/scale.h"
@@ -69 +67 @@
 #include "temporal/biquad.h"
 #include "temporal/filter.h"
+#include "spectral/filterbank.h"
+#include "spectral/mfcc.h"
+#include "spectral/fft.h"
+#include "spectral/phasevoc.h"
+#include "spectral/spectral_centroid.h"
 #include "pitch/pitchdetection.h"
 #include "pitch/pitchmcomb.h"
@@ -80 +83 @@
 #include "tempo/beattracking.h"
 #include "tempo/tempo.h"
-#include "spectral/filterbank.h"
-#include "spectral/mfcc.h"
 
 #ifdef __cplusplus

src/mathutils.c

@@ -433 +433 @@
 }
 
-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
  *