diff options
author | Juan Linietsky <reduzio@gmail.com> | 2016-05-03 22:32:38 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2016-05-03 22:32:38 -0300 |
commit | dd69aeceac3d1798d0869d8adfb44af883b5fb93 (patch) | |
tree | 717e9b909ada0661940f6f3d2bd5349c6424bbf1 /drivers/opus/celt/vq.h | |
parent | 567cb691ec49844101247bb9dc34bc2722f6af4f (diff) | |
parent | b81d9e6d614a67fd58e2256e90055589205bfa30 (diff) |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'drivers/opus/celt/vq.h')
-rw-r--r-- | drivers/opus/celt/vq.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/opus/celt/vq.h b/drivers/opus/celt/vq.h index b52b1a0982..10b5e55306 100644 --- a/drivers/opus/celt/vq.h +++ b/drivers/opus/celt/vq.h @@ -35,7 +35,12 @@ #include "opus/celt/entenc.h" #include "opus/celt/entdec.h" -#include "opus/celt/opus_modes.h" +#include "opus/celt/modes.h" + +#if defined(MIPSr1_ASM) +#include "opus/celt/mips/vq_mipsr1.h" +#endif + /** Algebraic pulse-vector quantiser. The signal x is replaced by the sum of * the pitch and a combination of pulses such that its norm is still equal @@ -63,8 +68,8 @@ unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, unsigned alg_unquant(celt_norm *X, int N, int K, int spread, int B, ec_dec *dec, opus_val16 gain); -void renormalise_vector(celt_norm *X, int N, opus_val16 gain); +void renormalise_vector(celt_norm *X, int N, opus_val16 gain, int arch); -int stereo_itheta(celt_norm *X, celt_norm *Y, int stereo, int N); +int stereo_itheta(const celt_norm *X, const celt_norm *Y, int stereo, int N, int arch); #endif /* VQ_H */ |