korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-26 13:44:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix MUL* macros with ()

Browse Source 
factor more multiplies in 4-subband encoder
This commit is contained in:
Brad Midgley 2007-10-05 05:42:55 +00:00
parent 7fbcefdd87
commit 99b92496ac
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sbc/sbc.c
View File

@ -793,19 +793,12 @@ static inline void _sbc_analyze_four(const int32_t *in, int32_t *out)
MULA(res, _anamatrix4[3], t[7]);
out[3] = SCALE4_STAGE2(res);
#else
/* some of these multiplies could be factored more but something overflows */
/* eg replace the first two lines with MUL(s[0], _anamatrix4[0], t[0] + t[4]) */
MUL(s[0], _anamatrix4[0], t[0]);
MULA(s[0], _anamatrix4[0], t[4]);
MUL(s[0], _anamatrix4[0], t[0] + t[4]);
MUL(s[1], _anamatrix4[2], t[2]);
MUL(s[2], _anamatrix4[1], t[1]);
MULA(s[2], _anamatrix4[1], t[3]);
MULA(s[2], _anamatrix4[3], t[5]);
MULA(s[2], -_anamatrix4[3], t[7]);
MUL(s[3], _anamatrix4[3], t[1]);
MULA(s[3], _anamatrix4[3], t[3]);
MULA(s[3], -_anamatrix4[1], t[5]);
MULA(s[3], _anamatrix4[1], t[7]);
MUL(s[2], _anamatrix4[1], t[1] + t[3]);
MULA(s[2], _anamatrix4[3], t[5] + t[7]);
MUL(s[3], _anamatrix4[3], t[1] + t[3]);
MULA(s[3], _anamatrix4[1], - t[5] + t[7]);
out[0] = SCALE4_STAGE2( s[0] + s[1] + s[2]);
out[1] = SCALE4_STAGE2(-s[0] + s[1] + s[3]);
out[2] = SCALE4_STAGE2(-s[0] + s[1] - s[3]);

4
sbc/sbc_math.h
View File

@ -64,6 +64,6 @@ typedef long long sbc_extended_t;
#define SBC_FIXED_0(val) { val = 0; }
#define ADD(dst, src) { dst += src; }
#define SUB(dst, src) { dst -= src; }
#define MUL(dst, a, b) { dst = (sbc_fixed_t) a * b; }
#define MULA(dst, a, b) { dst += (sbc_extended_t) a * b; }
#define MUL(dst, a, b) { dst = (sbc_fixed_t) (a) * (b); }
#define MULA(dst, a, b) { dst += (sbc_extended_t) (a) * (b); }
#define DIV2(dst, src) { dst = ASR(src, 1); }