included lsp files, simpler lsp.c, fixed build issues found by Andreas, plaraw modifi...

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

diff --git a/codec2/script/menu.sh b/codec2/script/menu.sh
index 75072841ff22de0322be5535a01b87e668c9a58e..e9ab7f0280a6883b452cc2220d9a27d4f6a854e2 100755 (executable)
--- a/codec2/script/menu.sh
+++ b/codec2/script/menu.sh
@@ -59,12 +59,13 @@ do
   echo -n -e "\r -"
   stty cbreak         # or stty raw
   readchar=`dd if=/dev/tty bs=1 count=1 2>/dev/null`
+  echo $readchar
   stty -cbreak
-  if [ $readchar == 'q' ] ; then
-    readchar=0
-  fi
+#  if [ $readchar == 'q' ] ; then
+#    readchar=0
+#  fi
   if [ $readchar -ne 0 ] ; then
-    play -f s -r 8000 -s w ${file[$readchar]} $dsp > /dev/null
+    echo "play -r 8000 -s -2 ${file[$readchar]} $dsp > /dev/null"
   fi
 done
 echo

diff --git a/codec2/script/playraw.sh b/codec2/script/playraw.sh
index f6033e209ca9951f6a7fd7c37e2f01aabc29a6ba..683cbaa16d98b654708b06dc4df27eebf6307c7f 100755 (executable)
--- a/codec2/script/playraw.sh
+++ b/codec2/script/playraw.sh
@@ -2,5 +2,5 @@
 # Plays a raw file
 # usage:
 #   playraw file.raw
-#   playraw file.raw -d /deve/dsp1
-play -f s -r 8000 -s w $1 $2 $3
+#   playraw file.raw -d /dev/dsp1 (e.g. for USB headphones)
+play -r 8000 -s -2 $1 $2 $3

diff --git a/codec2/src/Makefile b/codec2/src/Makefile
index 03036bc0e46a8bfe7bb95a3989705d0114442cd1..216430588a950ebd53f29c3ba4c3ee1d43d942ac 100644 (file)
--- a/codec2/src/Makefile
+++ b/codec2/src/Makefile
@@ -1,11 +1,10 @@
 CC=gcc
-CFLAGS=-g -Wall -I. -I../src -I../speex -Wall -g -DFLOATING_POINT -DVAR_ARRAYS
+CFLAGS=-g -Wall -I. -I../src -Wall -g -DFLOATING_POINT -DVAR_ARRAYS
 
 SINENC_OBJ  = sinenc.o globals.o initenc.o four1.o refine.o spec.o dump.o
 SINEDEC_OBJ = sinedec.o globals.o initenc.o initdec.o four1.o synth.o \
-              quantise.o lpc.o dump.o refine.o ../speex/lsp.o  \
-              ../speex/quant_lsp.o ../speex/bits.o ../speex/lsp_tables_nb.o \
-              ../speex/high_lsp_tables.o phase.o postfilter.o interp.o
+              quantise.o lpc.o dump.o refine.o lsp.o phase.o postfilter.o \
+              interp.o
 
 all: sinenc sinedec
 

diff --git a/codec2/src/lsp.c b/codec2/src/lsp.c
new file mode 100644 (file)
index 0000000..3f223e0
--- /dev/null
+++ b/codec2/src/lsp.c
@@ -0,0 +1,277 @@
+/*---------------------------------------------------------------------------*\\r
+\r
+  FILE........: lsp.c\r
+  AUTHOR......: David Rowe\r
+  DATE CREATED: 24/2/93\r
+\r
+\r
+  This file contains functions for LPC to LSP conversion and LSP to\r
+  LPC conversion. Note that the LSP coefficients are not in radians\r
+  format but in the x domain of the unit circle.\r
+\r
+\*---------------------------------------------------------------------------*/\r
+\r
+#include "lsp.h"\r
+#include <math.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+\r
+/*---------------------------------------------------------------------------*\\r
+\r
+  FUNCTION....: cheb_poly_eva()\r
+  AUTHOR......: David Rowe\r
+  DATE CREATED: 24/2/93\r
+\r
+  This function evalutes a series of chebyshev polynomials\r
+\r
+  FIXME: performing memory allocation at run time is very inefficient,\r
+  replace with stack variables of MAX_P size.\r
+\r
+\*---------------------------------------------------------------------------*/\r
+\r
+\r
+float cheb_poly_eva(float *coef,float x,int m)\r
+/*  float coef[]       coefficients of the polynomial to be evaluated  */\r
+/*  float x            the point where polynomial is to be evaluated   */\r
+/*  int m              order of the polynomial                         */\r
+{\r
+    int i;\r
+    float *T,*t,*u,*v,sum;\r
+\r
+    /* Allocate memory for chebyshev series formulation */\r
+\r
+    if((T = (float *)malloc((m/2+1)*sizeof(float))) == NULL){\r
+       printf("not enough memory to allocate buffer\n");\r
+       exit(1);\r
+    }\r
+\r
+    /* Initialise pointers */\r
+\r
+    t = T;                             /* T[i-2]                       */\r
+    *t++ = 1.0;\r
+    u = t--;                           /* T[i-1]                       */\r
+    *u++ = x;\r
+    v = u--;                           /* T[i]                         */\r
+\r
+    /* Evaluate chebyshev series formulation using iterative approach  */\r
+\r
+    for(i=2;i<=m/2;i++)\r
+       *v++ = (2*x)*(*u++) - *t++;     /* T[i] = 2*x*T[i-1] - T[i-2]   */\r
+\r
+    sum=0.0;                           /* initialise sum to zero       */\r
+    t = T;                             /* reset pointer                */\r
+\r
+    /* Evaluate polynomial and return value also free memory space */\r
+\r
+    for(i=0;i<=m/2;i++)\r
+       sum+=coef[(m/2)-i]**t++;\r
+\r
+    free(T);\r
+    return sum;\r
+}\r
+\r
+\r
+/*---------------------------------------------------------------------------*\\r
+\r
+  FUNCTION....: lpc_to_lsp()\r
+  AUTHOR......: David Rowe\r
+  DATE CREATED: 24/2/93\r
+\r
+  This function converts LPC coefficients to LSP coefficients.\r
+\r
+\*---------------------------------------------------------------------------*/\r
+\r
+int lpc_to_lsp (float *a,int lpcrdr,float *freq,int nb,float delta)\r
+/*  float *a                   lpc coefficients                        */\r
+/*  int lpcrdr                 order of LPC coefficients (10)          */\r
+/*  float *freq                LSP frequencies in the x domain         */\r
+/*  int nb                     number of sub-intervals (4)             */\r
+/*  float delta                        grid spacing interval (0.02)            */\r
+{\r
+    float psuml,psumr,psumm,temp_xr,xl,xr,xm;\r
+    float temp_psumr;\r
+    int i,j,m,flag,k;\r
+    float *Q;                  /* ptrs for memory allocation           */\r
+    float *P;\r
+    float *px;                 /* ptrs of respective P'(z) & Q'(z)     */\r
+    float *qx;\r
+    float *p;\r
+    float *q;\r
+    float *pt;                 /* ptr used for cheb_poly_eval()\r
+                                  whether P' or Q'                     */\r
+    int roots=0;               /* number of roots found                */\r
+    flag = 1;                  \r
+    m = lpcrdr/2;              /* order of P'(z) & Q'(z) polynimials   */\r
+\r
+    /* Allocate memory space for polynomials */\r
+\r
+    if((Q = (float *) malloc((m+1)*sizeof(float))) == NULL){\r
+       printf("not enough memory to allocate buffer\n");\r
+       exit(1);\r
+    }\r
+\r
+    if((P = (float *) malloc((m+1)*sizeof(float))) == NULL){\r
+       printf("not enough memory to allocate buffer\n");\r
+       exit(1);\r
+    }\r
+\r
+    /* determine P'(z)'s and Q'(z)'s coefficients where\r
+      P'(z) = P(z)/(1 + z^(-1)) and Q'(z) = Q(z)/(1-z^(-1)) */\r
+\r
+    px = P;                      /* initilaise ptrs */\r
+    qx = Q;\r
+    p = px;\r
+    q = qx;\r
+    *px++ = 1.0;\r
+    *qx++ = 1.0;\r
+    for(i=1;i<=m;i++){\r
+       *px++ = a[i]+a[lpcrdr+1-i]-*p++;\r
+       *qx++ = a[i]-a[lpcrdr+1-i]+*q++;\r
+    }\r
+    px = P;\r
+    qx = Q;\r
+    for(i=0;i<m;i++){\r
+       *px = 2**px;\r
+       *qx = 2**qx;\r
+        px++;\r
+        qx++;\r
+    }\r
+    px = P;                    /* re-initialise ptrs                   */\r
+    qx = Q;\r
+\r
+    /* Search for a zero in P'(z) polynomial first and then alternate to Q'(z).\r
+    Keep alternating between the two polynomials as each zero is found         */\r
+\r
+    xr = 0;                    /* initialise xr to zero                */\r
+    xl = 1.0;                  /* start at point xl = 1                */\r
+\r
+\r
+    for(j=0;j<lpcrdr;j++){\r
+       if(j%2)                 /* determines whether P' or Q' is eval. */\r
+           pt = qx;\r
+       else\r
+           pt = px;\r
+\r
+       psuml = cheb_poly_eva(pt,xl,lpcrdr);    /* evals poly. at xl    */\r
+       flag = 1;\r
+       while(flag && (xr >= -1.0)){\r
+           xr = xl - delta ;                   /* interval spacing     */\r
+           psumr = cheb_poly_eva(pt,xr,lpcrdr);/* poly(xl-delta_x)     */\r
+           temp_psumr = psumr;\r
+           temp_xr = xr;\r
+\r
+        /* if no sign change increment xr and re-evaluate\r
+           poly(xr). Repeat til sign change.  if a sign change has\r
+           occurred the interval is bisected and then checked again\r
+           for a sign change which determines in which interval the\r
+           zero lies in.  If there is no sign change between poly(xm)\r
+           and poly(xl) set interval between xm and xr else set\r
+           interval between xl and xr and repeat till root is located\r
+           within the specified limits  */\r
+\r
+           if((psumr*psuml)<0.0){\r
+               roots++;\r
+\r
+               psumm=psuml;\r
+               for(k=0;k<=nb;k++){\r
+                   xm = (xl+xr)/2;             /* bisect the interval  */\r
+                   psumm=cheb_poly_eva(pt,xm,lpcrdr);\r
+                   if(psumm*psuml>0.){\r
+                       psuml=psumm;\r
+                       xl=xm;\r
+                   }\r
+                   else{\r
+                       psumr=psumm;\r
+                       xr=xm;\r
+                   }\r
+               }\r
+\r
+              /* once zero is found, reset initial interval to xr      */\r
+              freq[j] = (xm);\r
+              xl = xm;\r
+              flag = 0;                /* reset flag for next search   */\r
+           }\r
+           else{\r
+               psuml=temp_psumr;\r
+               xl=temp_xr;\r
+           }\r
+       }\r
+    }\r
+    free(P);                           /* free memory space            */\r
+    free(Q);\r
+\r
+    return(roots);\r
+}\r
+\r
+/*---------------------------------------------------------------------------*\\r
+\r
+  FUNCTION....: lsp_to_lpc()\r
+  AUTHOR......: David Rowe\r
+  DATE CREATED: 24/2/93\r
+\r
+  This function converts LSP coefficients to LPC coefficients.  In the\r
+  Speex code we worked out a wayto simplify this significantly.\r
+\r
+\*---------------------------------------------------------------------------*/\r
+\r
+void lsp_to_lpc(float *freq,float *ak,int lpcrdr)\r
+/*  float *freq        array of LSP frequencies in the x domain        */\r
+/*  float *ak          array of LPC coefficients                       */\r
+/*  int lpcrdr         order of LPC coefficients                       */\r
+\r
+\r
+{\r
+    int i,j;\r
+    float xout1,xout2,xin1,xin2;\r
+    float *Wp;\r
+    float *pw,*n1,*n2,*n3,*n4;\r
+    int m = lpcrdr/2;\r
+\r
+    if((Wp = (float *) malloc((4*m+2)*sizeof(float))) == NULL){\r
+       printf("not enough memory to allocate buffer\n");\r
+       exit(1);\r
+    }\r
+    pw = Wp;\r
+\r
+    /* initialise contents of array */\r
+\r
+    for(i=0;i<=4*m+1;i++){             /* set contents of buffer to 0 */\r
+       *pw++ = 0.0;\r
+    }\r
+\r
+    /* Set pointers up */\r
+\r
+    pw = Wp;\r
+    xin1 = 1.0;\r
+    xin2 = 1.0;\r
+\r
+    /* reconstruct P(z) and Q(z) by cascading second order polynomials\r
+      in form 1 - 2xz(-1) +z(-2), where x is the LSP coefficient */\r
+\r
+    for(j=0;j<=lpcrdr;j++){\r
+       for(i=0;i<m;i++){\r
+           n1 = pw+(i*4);\r
+           n2 = n1 + 1;\r
+           n3 = n2 + 1;\r
+           n4 = n3 + 1;\r
+           xout1 = xin1 - 2*(freq[2*i]) * *n1 + *n2;\r
+           xout2 = xin2 - 2*(freq[2*i+1]) * *n3 + *n4;\r
+           *n2 = *n1;\r
+           *n4 = *n3;\r
+           *n1 = xin1;\r
+           *n3 = xin2;\r
+           xin1 = xout1;\r
+           xin2 = xout2;\r
+       }\r
+       xout1 = xin1 + *(n4+1);\r
+       xout2 = xin2 - *(n4+2);\r
+       ak[j] = (xout1 + xout2)*0.5;\r
+       *(n4+1) = xin1;\r
+       *(n4+2) = xin2;\r
+\r
+       xin1 = 0.0;\r
+       xin2 = 0.0;\r
+    }\r
+    free(Wp);\r
+}\r
+\r

diff --git a/codec2/src/lsp.h b/codec2/src/lsp.h
new file mode 100644 (file)
index 0000000..5b1135d
--- /dev/null
+++ b/codec2/src/lsp.h
@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------*\
+
+  FILE........: lsp.c
+  AUTHOR......: David Rowe
+  DATE CREATED: 24/2/93
+
+
+  This file contains functions for LPC to LSP conversion and LSP to
+  LPC conversion. Note that the LSP coefficients are not in radians
+  format but in the x domain of the unit circle.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef __LSP__
+#define __LSP__
+
+int lpc_to_lsp (float *a,int lpcrdr,float *freq,int nb,float delta);
+void lsp_to_lpc(float *freq,float *ak,int lpcrdr);
+
+#endif

diff --git a/codec2/src/quantise.c b/codec2/src/quantise.c
index 7a739069514b757fc1dafbb95d98956e7713e892..dddcc8c8dffca030d57ebbedda6ca0a4471fc4f6 100644 (file)
--- a/codec2/src/quantise.c
+++ b/codec2/src/quantise.c
@@ -30,9 +30,6 @@
 #include "quantise.h"
 #include "lpc.h"
 #include "dump.h"
-#include <lsp.h>
-#include <speex_bits.h>
-#include <quant_lsp.h>
 
 #define MAX_ORDER    20
 #define LSP_DELTA1 0.01         /* grid spacing for LSP root searches */

diff --git a/codec2/unittest/lsp1.txt b/codec2/unittest/lsp1.txt
new file mode 100644 (file)
index 0000000..88995de
--- /dev/null
+++ b/codec2/unittest/lsp1.txt
@@ -0,0 +1,16 @@
+225
+250
+275
+300
+325
+350
+375
+400
+425
+450
+475
+500
+525
+550
+575
+600

diff --git a/codec2/unittest/lsp10.txt b/codec2/unittest/lsp10.txt
new file mode 100644 (file)
index 0000000..1f1129b
--- /dev/null
+++ b/codec2/unittest/lsp10.txt
@@ -0,0 +1,5 @@
+2900
+3100
+3300
+3500
+

diff --git a/codec2/unittest/lsp2.txt b/codec2/unittest/lsp2.txt
new file mode 100644 (file)
index 0000000..35bdc62
--- /dev/null
+++ b/codec2/unittest/lsp2.txt
@@ -0,0 +1,17 @@
+325
+350
+375
+400
+425
+450
+475
+500
+525
+550
+575
+600
+625
+650
+675
+700
+

diff --git a/codec2/unittest/lsp3.txt b/codec2/unittest/lsp3.txt
new file mode 100644 (file)
index 0000000..200e11b
--- /dev/null
+++ b/codec2/unittest/lsp3.txt
@@ -0,0 +1,17 @@
+500
+550
+600
+650
+700
+750
+800
+850
+900
+950
+1000
+1050
+1100
+1150
+1200
+1250
+

diff --git a/codec2/unittest/lsp4.txt b/codec2/unittest/lsp4.txt
new file mode 100644 (file)
index 0000000..bce8ffc
--- /dev/null
+++ b/codec2/unittest/lsp4.txt
@@ -0,0 +1,17 @@
+700
+800
+900
+1000
+1100
+1200
+1300
+1400
+1500
+1600
+1700
+1800
+1900
+2000
+2100
+
+

diff --git a/codec2/unittest/lsp5.txt b/codec2/unittest/lsp5.txt
new file mode 100644 (file)
index 0000000..05d7221
--- /dev/null
+++ b/codec2/unittest/lsp5.txt
@@ -0,0 +1,18 @@
+ 950
+1050
+1150
+1250
+1350
+1450
+1550
+1650
+1750
+1850
+1950
+2050
+2150
+2250
+2350
+2450
+
+

diff --git a/codec2/unittest/lsp6.txt b/codec2/unittest/lsp6.txt
new file mode 100644 (file)
index 0000000..d1207ff
--- /dev/null
+++ b/codec2/unittest/lsp6.txt
@@ -0,0 +1,18 @@
+1100
+1200
+1300
+1400
+1500
+1600
+1700
+1800
+1900
+2000
+2100
+2200
+2300
+2400
+2500
+2600
+
+

diff --git a/codec2/unittest/lsp7.txt b/codec2/unittest/lsp7.txt
new file mode 100644 (file)
index 0000000..1f6eaa6
--- /dev/null
+++ b/codec2/unittest/lsp7.txt
@@ -0,0 +1,18 @@
+1500
+1600
+1700
+1800
+1900
+2000
+2100
+2200
+2300
+2400
+2500
+2600
+2700
+2800
+2900
+3000
+
+

diff --git a/codec2/unittest/lsp8.txt b/codec2/unittest/lsp8.txt
new file mode 100644 (file)
index 0000000..89607c8
--- /dev/null
+++ b/codec2/unittest/lsp8.txt
@@ -0,0 +1,10 @@
+2300
+2400
+2500
+2600
+2700
+2800
+2900
+3000
+
+

diff --git a/codec2/unittest/lsp9.txt b/codec2/unittest/lsp9.txt
new file mode 100644 (file)
index 0000000..82be58c
--- /dev/null
+++ b/codec2/unittest/lsp9.txt
@@ -0,0 +1,10 @@
+2500
+2600
+2700
+2800
+2900
+3000
+3100
+3200
+
+