From: drowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Tue, 8 Sep 2009 21:53:28 +0000 (+0000)
Subject: fixed buffer update bug in nlp
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=69b7ccda338710443fecc2c7800a1a91dab67100;p=freetel-svn-tracking.git

fixed buffer update bug in nlp

git-svn-id: https://svn.code.sf.net/p/freetel/code@47 01035d8c-6547-0410-b346-abe4f91aad63
---

diff --git a/codec2/README.txt b/codec2/README.txt
index 4585ead6..7a86c5df 100644
--- a/codec2/README.txt
+++ b/codec2/README.txt
@@ -31,7 +31,7 @@ Status
 3. Phase model developed that uses 0 bits for phase and 1 bit/frame
    for voiced/unvoiced decision.
 
-[[source code]]
+[[source]]
 The Source Code
 ---------------
 
@@ -270,14 +270,14 @@ References
 ----------
 
 [1] http://perens.com/[Bruce Perens] introducing the
-    http://codec2.org/[codec2 project concept]:
+    http://codec2.org/[codec2 project concept]
 
 [2] David's PhD Thesis,
     http://www.itr.unisa.edu.au/~steven/thesis/dgr.pdf["Techniques for
-    Harmonic Sinusoidal Coding"], used for baseline algorithm:
+    Harmonic Sinusoidal Coding"], used for baseline algorithm
 
 [3] http://www.rowetel.com/blog/?p=128[Open Source Low rate Speech
-    Codec Part 1 - Introduction:]
+    Codec Part 1 - Introduction]
     
 [4] http://www.rowetel.com/blog/?p=130[Open Source Low rate Speech
     Codec Part 1 - Spectral Magnitudes]
diff --git a/codec2/raw/mmt1.raw b/codec2/raw/mmt1.raw
new file mode 100644
index 00000000..40638a5a
Binary files /dev/null and b/codec2/raw/mmt1.raw differ
diff --git a/codec2/src/dump.c b/codec2/src/dump.c
index 1295074b..02a354d5 100644
--- a/codec2/src/dump.c
+++ b/codec2/src/dump.c
@@ -43,6 +43,8 @@ static FILE *fphase = NULL;
 static FILE *fphase_ = NULL;
 static FILE *ffw = NULL;
 static FILE *fe = NULL;
+static FILE *fsq = NULL;
+static FILE *fdec = NULL;
 
 static char  prefix[MAX_STR];
 
@@ -74,6 +76,10 @@ void dump_off(){
 	fclose(ffw);
     if (fe != NULL)
 	fclose(fe);
+    if (fsq != NULL)
+	fclose(fsq);
+    if (fdec != NULL)
+	fclose(fdec);
 }
 
 void dump_Sn(float Sn[]) {
@@ -288,4 +294,41 @@ void dump_e(float e_hz[]) {
     fprintf(fe,"\n");    
 }
 
+void dump_sq(float sq[]) {
+    int i;
+    char s[MAX_STR];
+
+    if (!dumpon) return;
+
+    if (fsq == NULL) {
+	sprintf(s,"%s_sq.txt", prefix);
+	fsq = fopen(s, "wt");
+	assert(fsq != NULL);
+    }
+
+    for(i=0; i<M/2; i++)
+	fprintf(fsq,"%f\t",sq[i]);
+    fprintf(fsq,"\n");    
+    for(i=M/2; i<M; i++)
+	fprintf(fsq,"%f\t",sq[i]);
+    fprintf(fsq,"\n");    
+}
+
+void dump_dec(COMP Fw[]) {
+    int i;
+    char s[MAX_STR];
+
+    if (!dumpon) return;
+
+    if (fdec == NULL) {
+	sprintf(s,"%s_dec.txt", prefix);
+	fdec = fopen(s, "wt");
+	assert(fdec != NULL);
+    }
+
+    for(i=0; i<320/5; i++)
+	fprintf(fdec,"%f\t",Fw[i].real);
+    fprintf(fdec,"\n");    
+}
+
 
diff --git a/codec2/src/dump.h b/codec2/src/dump.h
index b309430c..031445af 100644
--- a/codec2/src/dump.h
+++ b/codec2/src/dump.h
@@ -40,6 +40,11 @@ void dump_Pw(COMP Pw[]);
 void dump_lsp(float lsp[]);
 void dump_phase(float phase[]);
 void dump_phase_(float phase[]);
+
+/* NLP states */
+
+void dump_sq(float sq[]);
+void dump_dec(COMP Fw[]);
 void dump_Fw(COMP Fw[]);
 void dump_e(float e_hz[]);
 
diff --git a/codec2/src/nlp.c b/codec2/src/nlp.c
index 47f41f3a..c2ffbde5 100644
--- a/codec2/src/nlp.c
+++ b/codec2/src/nlp.c
@@ -146,7 +146,6 @@ float nlp(
   float  Sn[],			/* input speech vector */
   int    n,			/* frames shift (no. new samples in Sn[]) */
   int    m,			/* analysis window size */
-  int    d,			/* additional delay (used for testing) */
   int    pmin,			/* minimum pitch value */
   int    pmax,			/* maximum pitch value */
   float *pitch,			/* estimated pitch period in samples */
@@ -165,10 +164,10 @@ float nlp(
 
   /* Square, notch filter at DC, and LP filter vector */
 
-  for(i=0; i<n; i++) 		/* square speech samples */
-    sq[i+d+m-n] = Sn[i]*Sn[i];
+  for(i=m-n; i<M; i++) 		/* square latest speech samples */
+    sq[i] = Sn[i]*Sn[i];
 
-  for(i=m-n+d; i<m+d; i++) {	/* notch filter at DC */
+  for(i=m-n; i<m; i++) {	/* notch filter at DC */
     notch = sq[i] - mem_x;
     notch += COEFF*mem_y;
     mem_x = sq[i];
@@ -176,7 +175,7 @@ float nlp(
     sq[i] = notch;
   }
 
-  for(i=m-n+d; i<m+d; i++) {	/* FIR filter vector */
+  for(i=m-n; i<m; i++) {	/* FIR filter vector */
 
     for(j=0; j<NLP_NTAP-1; j++)
       mem_fir[j] = mem_fir[j+1];
@@ -195,10 +194,12 @@ float nlp(
   }
   for(i=0; i<m/DEC; i++)
     Fw[i].real = sq[i*DEC]*(0.5 - 0.5*cos(2*PI*i/(m/DEC-1)));
+  dump_dec(Fw);
   four1(&Fw[-1].imag,PE_FFT_SIZE,1);
   for(i=0; i<PE_FFT_SIZE; i++)
     Fw[i].real = Fw[i].real*Fw[i].real + Fw[i].imag*Fw[i].imag;
 
+  dump_sq(sq);
   dump_Fw(Fw);
 
   /* find global peak */
@@ -219,7 +220,7 @@ float nlp(
 
   /* Shift samples in buffer to make room for new samples */
 
-  for(i=0; i<m-n+d; i++)
+  for(i=0; i<m-n; i++)
     sq[i] = sq[i+n];
 
   /* return pitch and F0 estimate */
diff --git a/codec2/src/nlp.h b/codec2/src/nlp.h
index 5479af37..b39c02e7 100644
--- a/codec2/src/nlp.h
+++ b/codec2/src/nlp.h
@@ -33,7 +33,6 @@
 
 #define NLP_NTAP 48	 /* Decimation LPF order */
 
-float nlp(float Sn[], int n, int m, int d, int pmin, int pmax, float *pitch,
-	  COMP  Sw[]);
+float nlp(float Sn[], int n, int m, int pmin, int pmax, float *pitch, COMP  Sw[]);
 
 #endif
diff --git a/codec2/unittest/tnlp.c b/codec2/unittest/tnlp.c
index d4fedbbe..b1570485 100644
--- a/codec2/unittest/tnlp.c
+++ b/codec2/unittest/tnlp.c
@@ -34,6 +34,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <math.h>
 #include "nlp.h"
 #include "dump.h"
@@ -122,7 +123,7 @@ char *argv[];
       dft_speech();
       dump_Sn(Sn); dump_Sw(Sw); 
 
-      nlp(Sn,N,M,N-NLP_NTAP/2,PITCH_MIN,PITCH_MAX,&pitch,Sw);
+      nlp(Sn,N,M,PITCH_MIN,PITCH_MAX,&pitch,Sw);
 
       fprintf(fout,"%f\n",pitch);