A forgotten include guard and a fix for disabling wideband
authorJean-Marc Valin <jean-marc.valin@octasic.com>
Thu, 7 Aug 2008 20:37:43 +0000 (16:37 -0400)
committerJean-Marc Valin <jean-marc.valin@octasic.com>
Thu, 7 Aug 2008 20:37:43 +0000 (16:37 -0400)
libspeex/cb_search.c
libspeex/ltp.h

index fa96dac..26c2329 100644 (file)
@@ -158,9 +158,11 @@ int   update_target
    {
       spx_word16_t *x=t+subvect_size*i;
       /*Find new n-best based on previous n-best j*/
+#ifndef DISABLE_WIDEBAND
       if (have_sign)
          vq_nbest_sign(x, resp2, subvect_size, shape_cb_size, E, 1, &best_index, &best_dist, stack);
       else
+#endif /* DISABLE_WIDEBAND */
          vq_nbest(x, resp2, subvect_size, shape_cb_size, E, 1, &best_index, &best_dist, stack);
       
       speex_bits_pack(bits,best_index,params->shape_bits+have_sign);
@@ -379,9 +381,11 @@ int   update_target
          tener *= .5;
 #endif
          /*Find new n-best based on previous n-best j*/
+#ifndef DISABLE_WIDEBAND
          if (have_sign)
             vq_nbest_sign(x, resp2, subvect_size, shape_cb_size, E, N, best_index, best_dist, stack);
          else
+#endif /* DISABLE_WIDEBAND */
             vq_nbest(x, resp2, subvect_size, shape_cb_size, E, N, best_index, best_dist, stack);
 
          /*For all new n-bests*/
index 7a79882..a2912e2 100644 (file)
@@ -32,6 +32,9 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#ifndef LTP_H
+#define LTP_H
+
 #include "../include/speex/speex_bits.h"
 #include "arch.h"
 
@@ -139,3 +142,5 @@ int subframe_offset,
 spx_word16_t last_pitch_gain,
 int cdbk_offset
 );
+
+#endif /* LTP_H */