Started the decoder part, I think we now update filters in a better way

to take into account the encoding error.


git-svn-id: http://svn.xiph.org/trunk/speex@3112 0101bb08-14d6-0310-b084-bc0e0c8e3800

Author: jmvalin

Diff for: libspeex/cb_search.c

@@ -83,7 +83,7 @@ int   nsf                       /* number of samples in subframe */
       d += target[i]*resp[i];
       e += resp[i]*resp[i]+1;
     }
-    g = d/e;
+    g = d/(e+.1);
     score = g*d;
     /*printf ("score: %f %f %f %f\n", target[0],d,e,score);*/
     if (score >= bscore) {

Diff for: libspeex/speex.c

@@ -248,27 +248,32 @@ void encode(EncState *st, float *in, int *outSize, void *bits)
       for (i=0;i<st->subframeSize;i++)
          exc[i]=0;
 
-
       /* Compute zero response of A(z/g1) / ( A(z/g2) * Aq(z) ) */
       for (i=0;i<st->lpcSize;i++)
          st->mem4[i]=st->mem5[i];
       syn_filt_mem(exc, st->interp_qlpc, exc, st->subframeSize, st->lpcSize, st->mem4);
       for (i=0;i<st->lpcSize;i++)
          st->mem4[i]=st->mem5[i];
       residue_mem(exc, st->bw_lpc1, res, st->subframeSize, st->lpcSize, st->mem4);
-      syn_filt_mem(res, st->bw_lpc2, res, st->subframeSize, st->lpcSize, st->mem3);
+      for (i=0;i<st->lpcSize;i++)
+         st->mem4[i]=st->mem2[i];
+      syn_filt_mem(res, st->bw_lpc2, res, st->subframeSize, st->lpcSize, st->mem4);
 
       /* Compute weighted signal */
-      residue_mem(sp, st->bw_lpc1, sw, st->subframeSize, st->lpcSize, st->mem1);
-      syn_filt_mem(sw, st->bw_lpc2, sw, st->subframeSize, st->lpcSize, st->mem2);
-
+      residue(sp, st->bw_lpc1, sw, st->subframeSize, st->lpcSize);
       for (i=0;i<st->lpcSize;i++)
-        st->mem3[i]=sw[st->subframeSize-i-1];
+         st->mem4[i]=st->mem2[i];
+      syn_filt_mem(sw, st->bw_lpc2, sw, st->subframeSize, st->lpcSize, st->mem4);
+
+      /*for (i=0;i<st->lpcSize;i++)
+        st->mem3[i]=sw[st->subframeSize-i-1];*/
 
       /* Compute target signal */
       for (i=0;i<st->subframeSize;i++)
          target[i]=sw[i]-res[i];
 
+      for (i=0;i<st->subframeSize;i++)
+         exc[i]=0;
 #if 1 /*If set to 0, we compute the excitation directly from the target, i.e. we're cheating */
 
       /* Perform adaptive codebook search (3-tap pitch predictor) */
@@ -277,7 +282,7 @@ void encode(EncState *st, float *in, int *outSize, void *bits)
                         st->subframeSize);
       for (i=0;i<st->subframeSize;i++)
         exc[i]=gain[0]*exc[i-pitch]+gain[1]*exc[i-pitch-1]+gain[2]*exc[i-pitch-2];
-      printf ("3tap pitch = %d, gains = [%f %f %f]\n",pitch, gain[0], gain[1], gain[2]);
+      printf ("3-tap pitch = %d, gains = [%f %f %f]\n",pitch, gain[0], gain[1], gain[2]);
 
       /* Update target for adaptive codebook contribution */
       residue_zero(exc, st->bw_lpc1, res, st->subframeSize, st->lpcSize);
@@ -315,8 +320,6 @@ void encode(EncState *st, float *in, int *outSize, void *bits)
       /* Compute weighted signal again, from synthesized speech (not sure it's the right thing) */
       residue_mem(sp, st->bw_lpc1, sw, st->subframeSize, st->lpcSize, st->mem1);
       syn_filt_mem(sw, st->bw_lpc2, sw, st->subframeSize, st->lpcSize, st->mem2);
-      for (i=0;i<st->lpcSize;i++)
-        st->mem3[i]=sw[st->subframeSize-i-1];
    }
 
    /* Store the LSPs for interpolation in the next frame */

Diff for: libspeex/speex.h

@@ -63,6 +63,22 @@ typedef struct EncState {
 } EncState;
 
 typedef struct DecState {
+   int    first;          /* Is this the first frame? */
+   int    frameSize;      /* Size of frames */
+   int    subframeSize;   /* Size of sub-frames */
+   int    nbSubframes;    /* Number of sub-frames */
+   int    windowSize;     /* Analysis (LPC) window length */
+   int    lpcSize;        /* LPC order */
+   int    bufSize;        /* Buffer size */
+   float *inBuf;          /* Input buffer (original signal) */
+   float *frame;          /* Start of original frame */
+   float *excBuf;         /* Excitation buffer */
+   float *exc;            /* Start of excitation frame */
+   float *qlsp;           /* Quantized LSPs for current frame */
+   float *old_qlsp;       /* Quantized LSPs for previous frame */
+   float *interp_qlsp;    /* Interpolated quantized LSPs */
+   float *interp_qlpc;    /* Interpolated quantized LPCs */
+
 } DecState;
 
 /**Initializes encoder state*/