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

[jm at motherfish-iii.xiph.org]

Author: jm
Date: 2005-02-08 19:35:20 -0800 (Tue, 08 Feb 2005)
New Revision: 8879

Modified:
   trunk/speex/libspeex/cb_search.c
Log:
Special case for complexity=1


Modified: trunk/speex/libspeex/cb_search.c
===================================================================
--- trunk/speex/libspeex/cb_search.c	2005-02-09 02:56:18 UTC (rev 8878)
+++ trunk/speex/libspeex/cb_search.c	2005-02-09 03:35:20 UTC (rev 8879)
@@ -82,9 +82,7 @@
 
 
 
-#if 0
-
-void split_cb_search_shape_sign(
+void split_cb_search_shape_sign_N1(
 spx_sig_t target[],			/* target vector */
 spx_coef_t ak[],			/* LPCs for this subframe */
 spx_coef_t awk1[],			/* Weighted LPCs for this subframe */
@@ -234,8 +232,8 @@
    }
 }
 
-#else
 
+
 void split_cb_search_shape_sign(
 spx_sig_t target[],			/* target vector */
 spx_coef_t ak[],			/* LPCs for this subframe */
@@ -282,6 +280,11 @@
    if (N<1)
       N=1;
    
+   if (N==1)
+   {
+      split_cb_search_shape_sign_N1(target,ak,awk1,awk2,par,p,nsf,exc,r,bits,stack,complexity,update_target);
+      return;
+   }
    ot=PUSH(stack, N, spx_word16_t*);
    nt=PUSH(stack, N, spx_word16_t*);
    oind=PUSH(stack, N, int*);
@@ -518,8 +521,8 @@
          target[j]-=r2[j];
    }
 }
-#endif
 
+
 void split_cb_shape_sign_unquant(
 spx_sig_t *exc,
 const void *par,                      /* non-overlapping codebook */