diff options
author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-08-15 17:30:00 -0400 |
---|---|---|
committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-08-15 17:30:00 -0400 |
commit | b7c7653941f7add1dbf58360640b0da7ee6e6cf4 (patch) | |
tree | cabbe2c22a5a98cf04bb387e950d9d37833f772e /celt/vq.c | |
parent | fb19ba9126988e123dbde1b2384b87bd1165fc55 (diff) | |
download | libopus-b7c7653941f7add1dbf58360640b0da7ee6e6cf4.tar.gz |
Speeding up PVQ search by allocating even more pulses in the projection.
Diffstat (limited to 'celt/vq.c')
-rw-r--r-- | celt/vq.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -210,7 +210,8 @@ opus_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch) while (++j<N); sum = QCONST16(1.f,14); } - rcp = EXTRACT16(MULT16_32_Q16(K-1, celt_rcp(sum))); + /* Using K+e with e < 1 guarantees we cannot get more than K pulses. */ + rcp = EXTRACT16(MULT16_32_Q16(K+0.8, celt_rcp(sum))); j=0; do { #ifdef FIXED_POINT /* It's really important to round *towards zero* here */ @@ -225,7 +226,7 @@ opus_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch) pulsesLeft -= iy[j]; } while (++j<N); } - celt_assert2(pulsesLeft>=1, "Allocated too many pulses in the quick pass"); + celt_assert2(pulsesLeft>=0, "Allocated too many pulses in the quick pass"); /* This should never happen, but just in case it does (e.g. on silence) we fill the first bin with pulses. */ |