diff options
author | William Wilgus <me.theuser@yahoo.com> | 2019-01-04 02:01:18 -0600 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2021-04-23 14:23:04 +0000 |
commit | 14c6bb798d6bebc80f07e863236adbaf8d156a9c (patch) | |
tree | 551a4b641906c2626af844fa3239c1b2b1ff0ad3 /lib/rbcodec/codecs/libopus/celt/_kiss_fft_guts.h | |
parent | 75d93937965ec4df70d37df6d4feea04577c996b (diff) | |
download | rockbox-14c6bb798d6bebc80f07e863236adbaf8d156a9c.tar.gz rockbox-14c6bb798d6bebc80f07e863236adbaf8d156a9c.zip |
Sync opus codec to upstream git
Change-Id: I0cfcc0005c4ad7bfbb1aaf454188ce70fb043dc1
Diffstat (limited to 'lib/rbcodec/codecs/libopus/celt/_kiss_fft_guts.h')
-rw-r--r-- | lib/rbcodec/codecs/libopus/celt/_kiss_fft_guts.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/lib/rbcodec/codecs/libopus/celt/_kiss_fft_guts.h b/lib/rbcodec/codecs/libopus/celt/_kiss_fft_guts.h index 8ddb9adc96..17392b3e90 100644 --- a/lib/rbcodec/codecs/libopus/celt/_kiss_fft_guts.h +++ b/lib/rbcodec/codecs/libopus/celt/_kiss_fft_guts.h | |||
@@ -58,12 +58,12 @@ | |||
58 | # define S_MUL(a,b) MULT16_32_Q15(b, a) | 58 | # define S_MUL(a,b) MULT16_32_Q15(b, a) |
59 | 59 | ||
60 | # define C_MUL(m,a,b) \ | 60 | # define C_MUL(m,a,b) \ |
61 | do{ (m).r = SUB32(S_MUL((a).r,(b).r) , S_MUL((a).i,(b).i)); \ | 61 | do{ (m).r = SUB32_ovflw(S_MUL((a).r,(b).r) , S_MUL((a).i,(b).i)); \ |
62 | (m).i = ADD32(S_MUL((a).r,(b).i) , S_MUL((a).i,(b).r)); }while(0) | 62 | (m).i = ADD32_ovflw(S_MUL((a).r,(b).i) , S_MUL((a).i,(b).r)); }while(0) |
63 | 63 | ||
64 | # define C_MULC(m,a,b) \ | 64 | # define C_MULC(m,a,b) \ |
65 | do{ (m).r = ADD32(S_MUL((a).r,(b).r) , S_MUL((a).i,(b).i)); \ | 65 | do{ (m).r = ADD32_ovflw(S_MUL((a).r,(b).r) , S_MUL((a).i,(b).i)); \ |
66 | (m).i = SUB32(S_MUL((a).i,(b).r) , S_MUL((a).r,(b).i)); }while(0) | 66 | (m).i = SUB32_ovflw(S_MUL((a).i,(b).r) , S_MUL((a).r,(b).i)); }while(0) |
67 | 67 | ||
68 | # define C_MULBYSCALAR( c, s ) \ | 68 | # define C_MULBYSCALAR( c, s ) \ |
69 | do{ (c).r = S_MUL( (c).r , s ) ;\ | 69 | do{ (c).r = S_MUL( (c).r , s ) ;\ |
@@ -77,17 +77,17 @@ | |||
77 | DIVSCALAR( (c).i , div); }while (0) | 77 | DIVSCALAR( (c).i , div); }while (0) |
78 | 78 | ||
79 | #define C_ADD( res, a,b)\ | 79 | #define C_ADD( res, a,b)\ |
80 | do {(res).r=ADD32((a).r,(b).r); (res).i=ADD32((a).i,(b).i); \ | 80 | do {(res).r=ADD32_ovflw((a).r,(b).r); (res).i=ADD32_ovflw((a).i,(b).i); \ |
81 | }while(0) | 81 | }while(0) |
82 | #define C_SUB( res, a,b)\ | 82 | #define C_SUB( res, a,b)\ |
83 | do {(res).r=SUB32((a).r,(b).r); (res).i=SUB32((a).i,(b).i); \ | 83 | do {(res).r=SUB32_ovflw((a).r,(b).r); (res).i=SUB32_ovflw((a).i,(b).i); \ |
84 | }while(0) | 84 | }while(0) |
85 | #define C_ADDTO( res , a)\ | 85 | #define C_ADDTO( res , a)\ |
86 | do {(res).r = ADD32((res).r, (a).r); (res).i = ADD32((res).i,(a).i);\ | 86 | do {(res).r = ADD32_ovflw((res).r, (a).r); (res).i = ADD32_ovflw((res).i,(a).i);\ |
87 | }while(0) | 87 | }while(0) |
88 | 88 | ||
89 | #define C_SUBFROM( res , a)\ | 89 | #define C_SUBFROM( res , a)\ |
90 | do {(res).r = ADD32((res).r,(a).r); (res).i = SUB32((res).i,(a).i); \ | 90 | do {(res).r = ADD32_ovflw((res).r,(a).r); (res).i = SUB32_ovflw((res).i,(a).i); \ |
91 | }while(0) | 91 | }while(0) |
92 | 92 | ||
93 | #if defined(OPUS_ARM_INLINE_ASM) | 93 | #if defined(OPUS_ARM_INLINE_ASM) |
@@ -97,9 +97,8 @@ | |||
97 | #if defined(OPUS_ARM_INLINE_EDSP) | 97 | #if defined(OPUS_ARM_INLINE_EDSP) |
98 | #include "arm/kiss_fft_armv5e.h" | 98 | #include "arm/kiss_fft_armv5e.h" |
99 | #endif | 99 | #endif |
100 | 100 | #if defined(MIPSr1_ASM) | |
101 | #if defined(OPUS_CF_INLINE_ASM) | 101 | #include "mips/kiss_fft_mipsr1.h" |
102 | #include "cf/kiss_fft_cf.h" | ||
103 | #endif | 102 | #endif |
104 | 103 | ||
105 | #else /* not FIXED_POINT*/ | 104 | #else /* not FIXED_POINT*/ |