Changeset a2f3555

Timestamp:

Nov 21, 2007, 12:53:28 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:

9668a37

Parents:

c7f32b1

Message:

pitchyin.c: redo indentation

File:

• src/pitchyin.c (modified) (2 diffs)

src/pitchyin.c

@@ -33 +33 @@
 /* outputs the difference function */
 void aubio_pitchyin_diff(fvec_t * input, fvec_t * yin){
-        uint_t c,j,tau;
-        smpl_t tmp;
-        for (c=0;c<input->channels;c++)
-        {
-                for (tau=0;tau<yin->length;tau++)
-                {
-                        yin->data[c][tau] = 0.;
-                }
-                for (tau=1;tau<yin->length;tau++)
-                {
-                        for (j=0;j<yin->length;j++)
-                        {
-                                tmp = input->data[c][j] - input->data[c][j+tau];
-                                yin->data[c][tau] += SQR(tmp);
-                        }
-                }
-        }
+  uint_t c,j,tau;
+  smpl_t tmp;
+  for (c=0;c<input->channels;c++)
+  {
+    for (tau=0;tau<yin->length;tau++)
+    {
+      yin->data[c][tau] = 0.;
+    }
+    for (tau=1;tau<yin->length;tau++)
+    {
+      for (j=0;j<yin->length;j++)
+      {
+        tmp = input->data[c][j] - input->data[c][j+tau];
+        yin->data[c][tau] += SQR(tmp);
+      }
+    }
+  }
 }
 
 /* cumulative mean normalized difference function */
 void aubio_pitchyin_getcum(fvec_t * yin) {
-        uint_t c,tau;
-        smpl_t tmp;
-        for (c=0;c<yin->channels;c++)
-        {
-                tmp = 0.;
-                yin->data[c][0] = 1.;
-                //AUBIO_DBG("%f\t",yin->data[c][0]);
-                for (tau=1;tau<yin->length;tau++)
-                {
-                        tmp += yin->data[c][tau];
-                        yin->data[c][tau] *= tau/tmp;
-                        //AUBIO_DBG("%f\t",yin->data[c][tau]);
-                }
-                //AUBIO_DBG("\n");
-        }
+  uint_t c,tau;
+  smpl_t tmp;
+  for (c=0;c<yin->channels;c++)
+  {
+    tmp = 0.;
+    yin->data[c][0] = 1.;
+    //AUBIO_DBG("%f\t",yin->data[c][0]);
+    for (tau=1;tau<yin->length;tau++)
+    {
+      tmp += yin->data[c][tau];
+      yin->data[c][tau] *= tau/tmp;
+      //AUBIO_DBG("%f\t",yin->data[c][tau]);
+    }
+    //AUBIO_DBG("\n");
+  }
 }
 
 uint_t aubio_pitchyin_getpitch(fvec_t * yin) {
-        uint_t c=0,tau=1;
-        do 
-        {
-                if(yin->data[c][tau] < 0.1) { 
-                        while (yin->data[c][tau+1] < yin->data[c][tau]) {
-                                tau++;
-                        }
-                        return tau;
-                }
-                tau++;
-        } while (tau<yin->length);
-        //AUBIO_DBG("No pitch found");
-        return 0;
+  uint_t c=0,tau=1;
+  do 
+  {
+    if(yin->data[c][tau] < 0.1) { 
+      while (yin->data[c][tau+1] < yin->data[c][tau]) {
+        tau++;
+      }
+      return tau;
+    }
+    tau++;
+  } while (tau<yin->length);
+  //AUBIO_DBG("No pitch found");
+  return 0;
 }
 
@@ -90 +90 @@
 /* all the above in one */
 smpl_t aubio_pitchyin_getpitchfast(fvec_t * input, fvec_t * yin, smpl_t tol){
-        uint_t c=0,j,tau = 0;
-        sint_t period;
-        smpl_t tmp = 0., tmp2 = 0.;
-        yin->data[c][0] = 1.;
-        for (tau=1;tau<yin->length;tau++)
-        {
-                yin->data[c][tau] = 0.;
-                for (j=0;j<yin->length;j++)
-                {
-                        tmp = input->data[c][j] - input->data[c][j+tau];
-                        yin->data[c][tau] += SQR(tmp);
-                }
-                tmp2 += yin->data[c][tau];
-                yin->data[c][tau] *= tau/tmp2;
-                period = tau-3;
-                if(tau > 4 && (yin->data[c][period] < tol) && 
-                                (yin->data[c][period] < yin->data[c][period+1])) {
-                        return vec_quadint_min(yin,period,1);
-                }
-        }
-        return vec_quadint_min(yin,vec_min_elem(yin),1);
-        //return 0;
+  uint_t c=0,j,tau = 0;
+  sint_t period;
+  smpl_t tmp = 0., tmp2 = 0.;
+  yin->data[c][0] = 1.;
+  for (tau=1;tau<yin->length;tau++)
+  {
+    yin->data[c][tau] = 0.;
+    for (j=0;j<yin->length;j++)
+    {
+      tmp = input->data[c][j] - input->data[c][j+tau];
+      yin->data[c][tau] += SQR(tmp);
+    }
+    tmp2 += yin->data[c][tau];
+    yin->data[c][tau] *= tau/tmp2;
+    period = tau-3;
+    if(tau > 4 && (yin->data[c][period] < tol) && 
+        (yin->data[c][period] < yin->data[c][period+1])) {
+      return vec_quadint_min(yin,period,1);
+    }
+  }
+  return vec_quadint_min(yin,vec_min_elem(yin),1);
+  //return 0;
 }