diff qcelpdec.c @ 10010:18dab2b47db7 libavcodec

Make the LSP naming more consistent Use the convention from lsp.c: an LSF is a frequency, an LSP is the cosine of an LSF, and LSP functions should have an ff_acelp prefix. Use a "d" suffix to specify doubles. Patch by Colin McQuillan ( m.niloc googlemail com )
author superdump
date Mon, 03 Aug 2009 08:31:20 +0000
parents 7ad7d4094d1f
children c1cfa4679371
line wrap: on
line diff
--- a/qcelpdec.c	Mon Aug 03 02:09:23 2009 +0000
+++ b/qcelpdec.c	Mon Aug 03 08:31:20 2009 +0000
@@ -80,7 +80,7 @@
  *
  * TIA/EIA/IS-733 2.4.3.3.5
  */
-void ff_celp_lspf2lpc(const double *lspf, float *lpc);
+void ff_acelp_lspd2lpc(const double *lsp, float *lpc);
 
 /**
  * Initialize the speech codec according to the specification.
@@ -604,14 +604,14 @@
  */
 static void lspf2lpc(const float *lspf, float *lpc)
 {
-    double lsf[10];
+    double lsp[10];
     double bandwidth_expansion_coeff = QCELP_BANDWIDTH_EXPANSION_COEFF;
     int   i;
 
     for (i=0; i<10; i++)
-        lsf[i] = cos(M_PI * lspf[i]);
+        lsp[i] = cos(M_PI * lspf[i]);
 
-    ff_celp_lspf2lpc(lsf, lpc);
+    ff_acelp_lspd2lpc(lsp, lpc);
 
     for (i=0; i<10; i++)
     {