Changeset 1a74ac3

Timestamp:

Feb 4, 2011, 10:26:10 AM (14 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:

34422b4, 42515ac

Parents:

b583b9fb

Message:

src/mathutils.c: fix aubio_db_spl, thanks to Eric, closes #15

Location:

src

Files:

• mathutils.c (modified) (2 diffs)
• mathutils.h (modified) (1 diff)
• pitch/pitchmcomb.c (modified) (2 diffs)

src/mathutils.c

@@ -215 +215 @@
     energy += SQR (f->data[j]);
   }
-  return energy;
+  return energy / f->length;
 }
 
@@ -450 +450 @@
 aubio_db_spl (fvec_t * o)
 {
-  smpl_t val = SQRT (fvec_local_energy (o));
-  val /= (smpl_t) o->length;
-  return LIN2DB (val);
+  return 10. * LOG10 (fvec_local_energy (o));
 }
 

src/mathutils.h

@@ -107 +107 @@
 /** compute the energy of a vector
 
-  This function compute the sum of the squared elements of a vector.
+  This function compute the sum of the squared elements of a vector, normalised
+  by its length.
  
   \param v vector to get the energy from 

src/pitch/pitchmcomb.c

@@ -112 +112 @@
     newmag->data[j] = fftgrain->norm[j];
   /* detect only if local energy > 10. */
-  //if (fvec_local_energy(newmag)>10.) {
+  //if (fvec_local_energy(newmag) * newmag->length > 10.) {
   //hfc = fvec_local_hfc(newmag); //not used
   aubio_pitchmcomb_spectral_pp (p, newmag);
@@ -147 +147 @@
     newmag->data[j] = fftgrain->norm[j];
   /* detect only if local energy > 10. */
-  if (fvec_local_energy (newmag) > 10.) {
+  if (fvec_local_energy (newmag) * newmag->length > 10.) {
     /* hfc = fvec_local_hfc(newmag); do not use */
     aubio_pitchmcomb_spectral_pp (p, newmag);