[xiph-cvs] cvs commit: speex/libspeex nb_celp.c sb_celp.c

[Jean-Marc Valin]

jm          03/05/26 17:25:06

  Modified:    libspeex Tag: rel-1-0-branch nb_celp.c sb_celp.c
  Log:
  moved some fixes to the 1.0 branch. Still need to do something about files
  encoded with the wideband lsp_enforce_margin bug.

Revision  Changes    Path
No                   revision

<p>No                   revision

<p>1.114.2.1 +1 -1      speex/libspeex/nb_celp.c

Index: nb_celp.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/nb_celp.c,v
retrieving revision 1.114
retrieving revision 1.114.2.1
diff -u -r1.114 -r1.114.2.1
--- nb_celp.c	10 Mar 2003 17:16:17 -0000	1.114
+++ nb_celp.c	26 May 2003 21:25:06 -0000	1.114.2.1
@@ -485,7 +485,7 @@
       int quant;
       quant = (int)floor(.5+15*ol_pitch_coef);
       if (quant>15)
-         quant=0;
+         quant=15;
       if (quant<0)
          quant=0;
       speex_bits_pack(bits, quant, 4);

<p><p>1.118.2.2 +5 -5      speex/libspeex/sb_celp.c

Index: sb_celp.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/sb_celp.c,v
retrieving revision 1.118.2.1
retrieving revision 1.118.2.2
diff -u -r1.118.2.1 -r1.118.2.2
--- sb_celp.c	5 May 2003 03:42:22 -0000	1.118.2.1
+++ sb_celp.c	26 May 2003 21:25:06 -0000	1.118.2.2
@@ -463,15 +463,15 @@
       for (i=0;i<st->lpcSize;i++)
          st->interp_qlsp[i] = (1-tmp)*st->old_qlsp[i] + tmp*st->qlsp[i];
       
+      lsp_enforce_margin(st->interp_lsp, st->lpcSize, .002);
+      lsp_enforce_margin(st->interp_qlsp, st->lpcSize, .002);
+
       /* Compute interpolated LPCs (quantized and unquantized) */
       for (i=0;i<st->lpcSize;i++)
          st->interp_lsp[i] = cos(st->interp_lsp[i]);
       for (i=0;i<st->lpcSize;i++)
          st->interp_qlsp[i] = cos(st->interp_qlsp[i]);
 
-      lsp_enforce_margin(st->interp_lsp, st->lpcSize, .002);
-      lsp_enforce_margin(st->interp_qlsp, st->lpcSize, .002);
-
       lsp_to_lpc(st->interp_lsp, st->interp_lpc, st->lpcSize,stack);
       lsp_to_lpc(st->interp_qlsp, st->interp_qlpc, st->lpcSize, stack);
 
@@ -919,11 +919,11 @@
       for (i=0;i<st->lpcSize;i++)
          st->interp_qlsp[i] = (1-tmp)*st->old_qlsp[i] + tmp*st->qlsp[i];
 
+      lsp_enforce_margin(st->interp_qlsp, st->lpcSize, .002);
+
       /* LSPs to x-domain */
       for (i=0;i<st->lpcSize;i++)
          st->interp_qlsp[i] = cos(st->interp_qlsp[i]);
-
-      lsp_enforce_margin(st->interp_qlsp, st->lpcSize, .002);
 
       /* LSP to LPC */
       lsp_to_lpc(st->interp_qlsp, st->interp_qlpc, st->lpcSize, stack);

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.