Oops... let's leave a working narrowband codec...

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

2 files changed, 8 insertions, 5 deletions

diff --git a/libspeex/speex.c b/libspeex/speex.c
index fd7d1c4..b8df2a3 100644
--- a/libspeex/speex.c
+++ b/libspeex/speex.c
@@ -201,7 +201,7 @@ void encode(EncState *st, float *in, FrameBits *bits)
    
    /* LSP Quantization */
    st->lsp_quant(st->lsp, st->qlsp, st->lpcSize, bits);
-   printf ("LSP ");
+   /*printf ("LSP ");
    for (i=0;i<st->lpcSize;i++)
       printf ("%f ", st->lsp[i]);
    printf ("\n");
@@ -209,7 +209,7 @@ void encode(EncState *st, float *in, FrameBits *bits)
    for (i=0;i<st->lpcSize;i++)
       printf ("%f ", st->qlsp[i]);
    printf ("\n");
-   return;
+   return;*/
    /* Special case for first frame */
    if (st->first)
    {
diff --git a/libspeex/testenc.c b/libspeex/testenc.c
index 2a88d74..7a00b67 100644
--- a/libspeex/testenc.c
+++ b/libspeex/testenc.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#define FRAME_SIZE 256
+#define FRAME_SIZE 160
 #include <math.h>
 int main(int argc, char **argv)
 {
@@ -19,8 +19,8 @@ int main(int argc, char **argv)
 
    for (i=0;i<FRAME_SIZE;i++)
       bak2[i]=0;
-   encoder_init(&st, &wb_mode);
-   decoder_init(&dec, &wb_mode);
+   encoder_init(&st, &nb_mode);
+   decoder_init(&dec, &nb_mode);
    if (argc != 4 && argc != 3)
    {
       fprintf (stderr, "Usage: encode [in file] [out file] [bits file]\nargc = %d", argc);
@@ -57,6 +57,9 @@ int main(int argc, char **argv)
          snr = 10*log10((esig+1)/(enoise+1));
          printf ("real SNR = %f\n", snr);
       }
+      frame_bits_rewind(&bits);
+      
+      decode(&dec, &bits, input);
 
       /* Save the bits here */
       frame_bits_reset(&bits);