diff options
| author | Jean-Marc Valin <jean-marc.valin@octasic.com> | 2008-08-08 00:37:43 +0400 |
|---|---|---|
| committer | Jean-Marc Valin <jean-marc.valin@octasic.com> | 2008-08-08 00:37:43 +0400 |
| commit | 48b7074b3c0434b72ade97d053654dc570fd7a53 (patch) | |
| tree | 002156615fa16e4c8b3326b5be73d7501f5bf881 | |
| parent | 1be253dbaa76a2d3e7dbc0a8ba473454a271c987 (diff) | |
A forgotten include guard and a fix for disabling wideband
| -rw-r--r-- | libspeex/cb_search.c | 4 | ||||
| -rw-r--r-- | libspeex/ltp.h | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/libspeex/cb_search.c b/libspeex/cb_search.c index fa96dac..26c2329 100644 --- a/libspeex/cb_search.c +++ b/libspeex/cb_search.c @@ -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*/ diff --git a/libspeex/ltp.h b/libspeex/ltp.h index 7a79882..a2912e2 100644 --- a/libspeex/ltp.h +++ b/libspeex/ltp.h @@ -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 */ |