diff options
author | Nils Wallménius <nils@rockbox.org> | 2013-05-20 22:25:57 +0200 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2013-08-31 08:30:51 +0200 |
commit | 580b307fd791c0997a8831bc800bba87797bfb7e (patch) | |
tree | 807846056f06fd944a750ce41217a877910ebd59 /lib/rbcodec/codecs/libopus/celt/quant_bands.h | |
parent | 74761b70acd96cecc0d35450dd56a98ad9ee7d3d (diff) | |
download | rockbox-580b307fd791c0997a8831bc800bba87797bfb7e.tar.gz rockbox-580b307fd791c0997a8831bc800bba87797bfb7e.zip |
Sync opus codec to upstream git
Sync opus codec to upstream commit
02fed471a4568852d6618e041c4f2af0d7730ee2 (August 30 2013)
This brings in a lot of optimizations but also makes the diff
between our codec and the upstream much smaller as most of our
optimizations have been upstreamed or supeceded.
Speedups across the board for CELT mode files:
64kbps 128kbps
H300 9.82MHz 15.48MHz
c200 4.86MHz 9.63MHz
fuze v1 10.32MHz 15.92MHz
For the silk mode test file (16kbps) arm targets get a speedup
of about 2MHz while the H300 is 7.8MHz slower, likely because it's
now using the pseudostack more rather than the real stack which
is in iram. Patches to get around that are upcomming.
Change-Id: Ifecf963e461c51ac42e09dac1e91bc4bc3b12fa3
Diffstat (limited to 'lib/rbcodec/codecs/libopus/celt/quant_bands.h')
-rw-r--r-- | lib/rbcodec/codecs/libopus/celt/quant_bands.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/rbcodec/codecs/libopus/celt/quant_bands.h b/lib/rbcodec/codecs/libopus/celt/quant_bands.h index bec2855cf0..0490bca4b4 100644 --- a/lib/rbcodec/codecs/libopus/celt/quant_bands.h +++ b/lib/rbcodec/codecs/libopus/celt/quant_bands.h | |||
@@ -35,6 +35,12 @@ | |||
35 | #include "entdec.h" | 35 | #include "entdec.h" |
36 | #include "mathops.h" | 36 | #include "mathops.h" |
37 | 37 | ||
38 | #ifdef FIXED_POINT | ||
39 | extern const signed char eMeans[25]; | ||
40 | #else | ||
41 | extern const opus_val16 eMeans[25]; | ||
42 | #endif | ||
43 | |||
38 | void amp2Log2(const CELTMode *m, int effEnd, int end, | 44 | void amp2Log2(const CELTMode *m, int effEnd, int end, |
39 | celt_ener *bandE, opus_val16 *bandLogE, int C); | 45 | celt_ener *bandE, opus_val16 *bandLogE, int C); |
40 | 46 | ||
@@ -45,7 +51,7 @@ void quant_coarse_energy(const CELTMode *m, int start, int end, int effEnd, | |||
45 | const opus_val16 *eBands, opus_val16 *oldEBands, opus_uint32 budget, | 51 | const opus_val16 *eBands, opus_val16 *oldEBands, opus_uint32 budget, |
46 | opus_val16 *error, ec_enc *enc, int C, int LM, | 52 | opus_val16 *error, ec_enc *enc, int C, int LM, |
47 | int nbAvailableBytes, int force_intra, opus_val32 *delayedIntra, | 53 | int nbAvailableBytes, int force_intra, opus_val32 *delayedIntra, |
48 | int two_pass, int loss_rate); | 54 | int two_pass, int loss_rate, int lfe); |
49 | 55 | ||
50 | void quant_fine_energy(const CELTMode *m, int start, int end, opus_val16 *oldEBands, opus_val16 *error, int *fine_quant, ec_enc *enc, int C); | 56 | void quant_fine_energy(const CELTMode *m, int start, int end, opus_val16 *oldEBands, opus_val16 *error, int *fine_quant, ec_enc *enc, int C); |
51 | 57 | ||