Changeset ad04467 for src/pitch

Timestamp:

Nov 3, 2009, 4:06:15 PM (15 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:

63f3c70

Parents:

8bc4800

Message:

src/pitch/pitchschmitt.c: indent

File:

• src/pitch/pitchschmitt.c (modified) (3 diffs)

src/pitch/pitchschmitt.c

@@ -24 +24 @@
 #include "pitch/pitchschmitt.h"
 
-smpl_t aubio_schmittS16LE (aubio_pitchschmitt_t *p, uint_t nframes, signed short int *indata);
+smpl_t aubio_schmittS16LE (aubio_pitchschmitt_t * p, uint_t nframes,
+    signed short int *indata);
 
-struct _aubio_pitchschmitt_t {
-        uint_t blockSize;
-        uint_t rate;
-        signed short int *schmittBuffer;
-        signed short int *schmittPointer;
-        signed short int *buf;
+struct _aubio_pitchschmitt_t
+{
+  uint_t blockSize;
+  uint_t rate;
+  signed short int *schmittBuffer;
+  signed short int *schmittPointer;
+  signed short int *buf;
 };
 
-aubio_pitchschmitt_t * new_aubio_pitchschmitt (uint_t size)
+aubio_pitchschmitt_t *
+new_aubio_pitchschmitt (uint_t size)
 {
-  aubio_pitchschmitt_t * p = AUBIO_NEW(aubio_pitchschmitt_t);
+  aubio_pitchschmitt_t *p = AUBIO_NEW (aubio_pitchschmitt_t);
   p->blockSize = size;
-  p->schmittBuffer = AUBIO_ARRAY(signed short int,p->blockSize);
-  p->buf = AUBIO_ARRAY(signed short int,p->blockSize);
+  p->schmittBuffer = AUBIO_ARRAY (signed short int, p->blockSize);
+  p->buf = AUBIO_ARRAY (signed short int, p->blockSize);
   p->schmittPointer = p->schmittBuffer;
   return p;
@@ -57 +60 @@
 }
 
-smpl_t aubio_schmittS16LE (aubio_pitchschmitt_t *p, uint_t nframes, signed short int *indata)
+smpl_t
+aubio_schmittS16LE (aubio_pitchschmitt_t * p, uint_t nframes,
+    signed short int *indata)
 {
   uint_t i, j;
@@ -66 +71 @@
   smpl_t period = 0., trigfact = 0.6;
 
-  for (i=0; i<nframes; i++) {
+  for (i = 0; i < nframes; i++) {
     *schmittPointer++ = indata[i];
-    if (schmittPointer-schmittBuffer >= (sint_t)blockSize) {
+    if (schmittPointer - schmittBuffer >= (sint_t) blockSize) {
       sint_t endpoint, startpoint, t1, t2, A1, A2, tc, schmittTriggered;
 
       schmittPointer = schmittBuffer;
 
-      for (j=0,A1=0,A2=0; j<blockSize; j++) {
-        if (schmittBuffer[j]>0 && A1<schmittBuffer[j])  A1 = schmittBuffer[j];
-        if (schmittBuffer[j]<0 && A2<-schmittBuffer[j]) A2 = -schmittBuffer[j];
+      for (j = 0, A1 = 0, A2 = 0; j < blockSize; j++) {
+        if (schmittBuffer[j] > 0 && A1 < schmittBuffer[j])
+          A1 = schmittBuffer[j];
+        if (schmittBuffer[j] < 0 && A2 < -schmittBuffer[j])
+          A2 = -schmittBuffer[j];
       }
-      t1 =   (sint_t)( A1 * trigfact + 0.5);
-      t2 = - (sint_t)( A2 * trigfact + 0.5);
-      startpoint=0;
-      for (j=1; schmittBuffer[j]<=t1 && j<blockSize; j++);
-      for (; !(schmittBuffer[j]  >=t2 &&
-               schmittBuffer[j+1]< t2) && j<blockSize; j++);
-      startpoint=j;
-      schmittTriggered=0;
-      endpoint=startpoint+1;
-      for(j=startpoint,tc=0; j<blockSize; j++) {
-        if (!schmittTriggered) {
-          schmittTriggered = (schmittBuffer[j] >= t1);
-        } else if (schmittBuffer[j]>=t2 && schmittBuffer[j+1]<t2) {
-          endpoint=j;
-          tc++;
-          schmittTriggered = 0;
-        }
+      t1 = (sint_t) (A1 * trigfact + 0.5);
+      t2 = -(sint_t) (A2 * trigfact + 0.5);
+      startpoint = 0;
+      for (j = 1; schmittBuffer[j] <= t1 && j < blockSize; j++);
+      for (; !(schmittBuffer[j] >= t2 &&
+              schmittBuffer[j + 1] < t2) && j < blockSize; j++);
+      startpoint = j;
+      schmittTriggered = 0;
+      endpoint = startpoint + 1;
+      for (j = startpoint, tc = 0; j < blockSize; j++) {
+        if (!schmittTriggered) {
+          schmittTriggered = (schmittBuffer[j] >= t1);
+        } else if (schmittBuffer[j] >= t2 && schmittBuffer[j + 1] < t2) {
+          endpoint = j;
+          tc++;
+          schmittTriggered = 0;
+        }
       }
       if ((endpoint > startpoint) && (tc > 0)) {
-        period = (smpl_t)(endpoint-startpoint)/tc;
+        period = (smpl_t) (endpoint - startpoint) / tc;
       }
     }
   }
 
-  p->schmittBuffer  = schmittBuffer;
+  p->schmittBuffer = schmittBuffer;
   p->schmittPointer = schmittPointer;
   return period;
 }
 
-void del_aubio_pitchschmitt (aubio_pitchschmitt_t *p)
+void
+del_aubio_pitchschmitt (aubio_pitchschmitt_t * p)
 {
-  AUBIO_FREE(p->schmittBuffer);
-  AUBIO_FREE(p);
+  AUBIO_FREE (p->schmittBuffer);
+  AUBIO_FREE (p);
 }
-