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/arch.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/arch.h')
-rw-r--r-- | lib/rbcodec/codecs/libopus/celt/arch.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/rbcodec/codecs/libopus/celt/arch.h b/lib/rbcodec/codecs/libopus/celt/arch.h index 03cda40f69..c0f9413d00 100644 --- a/lib/rbcodec/codecs/libopus/celt/arch.h +++ b/lib/rbcodec/codecs/libopus/celt/arch.h | |||
@@ -100,6 +100,7 @@ typedef opus_val32 celt_ener; | |||
100 | #define DB_SHIFT 10 | 100 | #define DB_SHIFT 10 |
101 | 101 | ||
102 | #define EPSILON 1 | 102 | #define EPSILON 1 |
103 | #define VERY_SMALL 0 | ||
103 | #define VERY_LARGE16 ((opus_val16)32767) | 104 | #define VERY_LARGE16 ((opus_val16)32767) |
104 | #define Q15_ONE ((opus_val16)32767) | 105 | #define Q15_ONE ((opus_val16)32767) |
105 | 106 | ||
@@ -112,16 +113,18 @@ typedef opus_val32 celt_ener; | |||
112 | 113 | ||
113 | #include "fixed_generic.h" | 114 | #include "fixed_generic.h" |
114 | 115 | ||
115 | #ifdef ARM5E_ASM | 116 | #ifdef ARMv5E_ASM |
116 | #include "fixed_arm5e.h" | 117 | #include "arm/fixed_armv5e.h" |
117 | #elif defined (ARM4_ASM) | 118 | #elif defined (ARMv4_ASM) |
118 | #include "fixed_arm4.h" | 119 | #include "arm/fixed_armv4.h" |
119 | #elif defined (BFIN_ASM) | 120 | #elif defined (BFIN_ASM) |
120 | #include "fixed_bfin.h" | 121 | #include "fixed_bfin.h" |
121 | #elif defined (TI_C5X_ASM) | 122 | #elif defined (TI_C5X_ASM) |
122 | #include "fixed_c5x.h" | 123 | #include "fixed_c5x.h" |
123 | #elif defined (TI_C6X_ASM) | 124 | #elif defined (TI_C6X_ASM) |
124 | #include "fixed_c6x.h" | 125 | #include "fixed_c6x.h" |
126 | #elif defined (CF_ASM) | ||
127 | #include "cf/fixed_cf.h" | ||
125 | #endif | 128 | #endif |
126 | 129 | ||
127 | #endif | 130 | #endif |
@@ -140,6 +143,7 @@ typedef float celt_ener; | |||
140 | #define NORM_SCALING 1.f | 143 | #define NORM_SCALING 1.f |
141 | 144 | ||
142 | #define EPSILON 1e-15f | 145 | #define EPSILON 1e-15f |
146 | #define VERY_SMALL 1e-30f | ||
143 | #define VERY_LARGE16 1e15f | 147 | #define VERY_LARGE16 1e15f |
144 | #define Q15_ONE ((opus_val16)1.f) | 148 | #define Q15_ONE ((opus_val16)1.f) |
145 | 149 | ||
@@ -161,6 +165,7 @@ typedef float celt_ener; | |||
161 | #define SHR(a,shift) (a) | 165 | #define SHR(a,shift) (a) |
162 | #define SHL(a,shift) (a) | 166 | #define SHL(a,shift) (a) |
163 | #define SATURATE(x,a) (x) | 167 | #define SATURATE(x,a) (x) |
168 | #define SATURATE16(x) (x) | ||
164 | 169 | ||
165 | #define ROUND16(a,shift) (a) | 170 | #define ROUND16(a,shift) (a) |
166 | #define HALF16(x) (.5f*(x)) | 171 | #define HALF16(x) (.5f*(x)) |