Changeset 60 for mppenc/branches/r2d/libmpcpsy/cvd.c

Timestamp:

09/28/06 18:15:21 (18 years ago)

Author:

r2d

Message:

added a PsyModel struct, too much members in it. some will be removed later

File:

• mppenc/branches/r2d/libmpcpsy/cvd.c (modified) (6 diffs)

mppenc/branches/r2d/libmpcpsy/cvd.c

@@ -18 +18 @@
  */
 
-#include "mppenc.h"
+#include "libmpcpsy.h"
+
+#include <math.h>
+#include <string.h>
+
 
 /* C O N S T A N T S */
@@ -72 +76 @@
 // Analyze the Cepstrum, search for the basic harmonic
 static void
-CEP_Analyse2048 ( float* res1,
+CEP_Analyse2048 ( PsyModel* m,
+                                  float* res1,
                   float* res2,
                   float* qual1,
@@ -163 +168 @@
         *res1 = line_sum / sum;
 
-    if ( CVD_used < 2 )
+    if ( m->CVD_used < 2 )
         return;
 
@@ -231 +236 @@
 // output: Array *vocal contains information if the FFT-Line is a harmonic component
 int
-CVD2048 ( const float* spec, int* vocal )
+CVD2048 ( PsyModel* m, const float* spec, int* vocal )
 {
     static float  cep [4096];     // cep[4096] -- array, which is also used for the 2048 FFT
@@ -241 +246 @@
     int           n;
 
-    ENTER(20);
     // Calculating logarithmated, windowed spectrum cep[]
     // cep[512...1024] = 0 -- cep[1025...2047] doesn't matter, because the first have to be filled by fft
@@ -255 +259 @@
 
     // search the harmonic
-    CEP_Analyse2048 ( &res1, &res2, &qual1, &qual2, cep );
+        CEP_Analyse2048 ( m, &res1, &res2, &qual1, &qual2, cep );
 //#include "cvd.h"
     if ( res1 > 0.f  ||  res2 > 0.f ) {
         if ( res1 > 0. ) SetVoiceLines ( vocal, res1, 100 );
         if ( res2 > 0. ) SetVoiceLines ( vocal, res2,  20 );
-        LEAVE(20);
         return 1;
     }
-    LEAVE(20);
     return 0;
 }