[xiph-commits] r10802 - trunk/speex/libspeex

[jm at svn.xiph.org]

Author: jm
Date: 2006-02-12 02:40:21 -0800 (Sun, 12 Feb 2006)
New Revision: 10802

Modified:
   trunk/speex/libspeex/nb_celp.c
Log:
fixed a bug when a packet is lost and submode-encoding is disabled.


Modified: trunk/speex/libspeex/nb_celp.c
===================================================================
--- trunk/speex/libspeex/nb_celp.c	2006-02-12 08:16:08 UTC (rev 10801)
+++ trunk/speex/libspeex/nb_celp.c	2006-02-12 10:40:21 UTC (rev 10802)
@@ -1277,12 +1277,6 @@
    st=(DecState*)state;
    stack=st->stack;
 
-   if (st->encode_submode)
-   {
-#ifdef EPIC_48K
-   if (!st->lbr_48k) {
-#endif
-
    /* Check if we're in DTX mode*/
    if (!bits && st->dtx_enabled)
    {
@@ -1296,6 +1290,12 @@
          return 0;
       }
 
+      if (st->encode_submode)
+      {
+#ifdef EPIC_48K
+         if (!st->lbr_48k) {
+#endif
+
       /* Search for next narrowband block (handle requests, skip wideband blocks) */
       do {
          if (speex_bits_remaining(bits)<5)
@@ -1365,11 +1365,11 @@
 
       /* Get the sub-mode that was used */
       st->submodeID = m;
-
-   }
 #ifdef EPIC_48K
-   }
+         }
 #endif
+      }
+
    }
 
    /* Shift all buffers by one frame */