summaryrefslogtreecommitdiff
path: root/lib/rbcodec/codecs/libopus/silk/arm
diff options
context:
space:
mode:
Diffstat (limited to 'lib/rbcodec/codecs/libopus/silk/arm')
-rw-r--r--lib/rbcodec/codecs/libopus/silk/arm/SigProc_FIX_armv4.h2
-rw-r--r--lib/rbcodec/codecs/libopus/silk/arm/SigProc_FIX_armv5e.h4
-rw-r--r--lib/rbcodec/codecs/libopus/silk/arm/macros_armv4.h8
-rw-r--r--lib/rbcodec/codecs/libopus/silk/arm/macros_armv5e.h24
4 files changed, 19 insertions, 19 deletions
diff --git a/lib/rbcodec/codecs/libopus/silk/arm/SigProc_FIX_armv4.h b/lib/rbcodec/codecs/libopus/silk/arm/SigProc_FIX_armv4.h
index d69573e3d4..ff62b1e5d6 100644
--- a/lib/rbcodec/codecs/libopus/silk/arm/SigProc_FIX_armv4.h
+++ b/lib/rbcodec/codecs/libopus/silk/arm/SigProc_FIX_armv4.h
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
30#define SILK_SIGPROC_FIX_ARMv4_H 30#define SILK_SIGPROC_FIX_ARMv4_H
31 31
32#undef silk_MLA 32#undef silk_MLA
33static inline opus_int32 silk_MLA_armv4(opus_int32 a, opus_int32 b, 33static OPUS_INLINE opus_int32 silk_MLA_armv4(opus_int32 a, opus_int32 b,
34 opus_int32 c) 34 opus_int32 c)
35{ 35{
36 opus_int32 res; 36 opus_int32 res;
diff --git a/lib/rbcodec/codecs/libopus/silk/arm/SigProc_FIX_armv5e.h b/lib/rbcodec/codecs/libopus/silk/arm/SigProc_FIX_armv5e.h
index 81a6324f65..617a09cab1 100644
--- a/lib/rbcodec/codecs/libopus/silk/arm/SigProc_FIX_armv5e.h
+++ b/lib/rbcodec/codecs/libopus/silk/arm/SigProc_FIX_armv5e.h
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
30#define SILK_SIGPROC_FIX_ARMv5E_H 30#define SILK_SIGPROC_FIX_ARMv5E_H
31 31
32#undef silk_SMULTT 32#undef silk_SMULTT
33static inline opus_int32 silk_SMULTT_armv5e(opus_int32 a, opus_int32 b) 33static OPUS_INLINE opus_int32 silk_SMULTT_armv5e(opus_int32 a, opus_int32 b)
34{ 34{
35 opus_int32 res; 35 opus_int32 res;
36 __asm__( 36 __asm__(
@@ -44,7 +44,7 @@ static inline opus_int32 silk_SMULTT_armv5e(opus_int32 a, opus_int32 b)
44#define silk_SMULTT(a, b) (silk_SMULTT_armv5e(a, b)) 44#define silk_SMULTT(a, b) (silk_SMULTT_armv5e(a, b))
45 45
46#undef silk_SMLATT 46#undef silk_SMLATT
47static inline opus_int32 silk_SMLATT_armv5e(opus_int32 a, opus_int32 b, 47static OPUS_INLINE opus_int32 silk_SMLATT_armv5e(opus_int32 a, opus_int32 b,
48 opus_int32 c) 48 opus_int32 c)
49{ 49{
50 opus_int32 res; 50 opus_int32 res;
diff --git a/lib/rbcodec/codecs/libopus/silk/arm/macros_armv4.h b/lib/rbcodec/codecs/libopus/silk/arm/macros_armv4.h
index 58df6c2e2b..3f30e97288 100644
--- a/lib/rbcodec/codecs/libopus/silk/arm/macros_armv4.h
+++ b/lib/rbcodec/codecs/libopus/silk/arm/macros_armv4.h
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
30 30
31/* (a32 * (opus_int32)((opus_int16)(b32))) >> 16 output have to be 32bit int */ 31/* (a32 * (opus_int32)((opus_int16)(b32))) >> 16 output have to be 32bit int */
32#undef silk_SMULWB 32#undef silk_SMULWB
33static inline opus_int32 silk_SMULWB_armv4(opus_int32 a, opus_int16 b) 33static OPUS_INLINE opus_int32 silk_SMULWB_armv4(opus_int32 a, opus_int16 b)
34{ 34{
35 unsigned rd_lo; 35 unsigned rd_lo;
36 int rd_hi; 36 int rd_hi;
@@ -50,7 +50,7 @@ static inline opus_int32 silk_SMULWB_armv4(opus_int32 a, opus_int16 b)
50 50
51/* (a32 * (b32 >> 16)) >> 16 */ 51/* (a32 * (b32 >> 16)) >> 16 */
52#undef silk_SMULWT 52#undef silk_SMULWT
53static inline opus_int32 silk_SMULWT_armv4(opus_int32 a, opus_int32 b) 53static OPUS_INLINE opus_int32 silk_SMULWT_armv4(opus_int32 a, opus_int32 b)
54{ 54{
55 unsigned rd_lo; 55 unsigned rd_lo;
56 int rd_hi; 56 int rd_hi;
@@ -70,7 +70,7 @@ static inline opus_int32 silk_SMULWT_armv4(opus_int32 a, opus_int32 b)
70 70
71/* (a32 * b32) >> 16 */ 71/* (a32 * b32) >> 16 */
72#undef silk_SMULWW 72#undef silk_SMULWW
73static inline opus_int32 silk_SMULWW_armv4(opus_int32 a, opus_int32 b) 73static OPUS_INLINE opus_int32 silk_SMULWW_armv4(opus_int32 a, opus_int32 b)
74{ 74{
75 unsigned rd_lo; 75 unsigned rd_lo;
76 int rd_hi; 76 int rd_hi;
@@ -85,7 +85,7 @@ static inline opus_int32 silk_SMULWW_armv4(opus_int32 a, opus_int32 b)
85#define silk_SMULWW(a, b) (silk_SMULWW_armv4(a, b)) 85#define silk_SMULWW(a, b) (silk_SMULWW_armv4(a, b))
86 86
87#undef silk_SMLAWW 87#undef silk_SMLAWW
88static inline opus_int32 silk_SMLAWW_armv4(opus_int32 a, opus_int32 b, 88static OPUS_INLINE opus_int32 silk_SMLAWW_armv4(opus_int32 a, opus_int32 b,
89 opus_int32 c) 89 opus_int32 c)
90{ 90{
91 unsigned rd_lo; 91 unsigned rd_lo;
diff --git a/lib/rbcodec/codecs/libopus/silk/arm/macros_armv5e.h b/lib/rbcodec/codecs/libopus/silk/arm/macros_armv5e.h
index 63b1e30f48..aad4117e46 100644
--- a/lib/rbcodec/codecs/libopus/silk/arm/macros_armv5e.h
+++ b/lib/rbcodec/codecs/libopus/silk/arm/macros_armv5e.h
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
31 31
32/* (a32 * (opus_int32)((opus_int16)(b32))) >> 16 output have to be 32bit int */ 32/* (a32 * (opus_int32)((opus_int16)(b32))) >> 16 output have to be 32bit int */
33#undef silk_SMULWB 33#undef silk_SMULWB
34static inline opus_int32 silk_SMULWB_armv5e(opus_int32 a, opus_int16 b) 34static OPUS_INLINE opus_int32 silk_SMULWB_armv5e(opus_int32 a, opus_int16 b)
35{ 35{
36 int res; 36 int res;
37 __asm__( 37 __asm__(
@@ -46,7 +46,7 @@ static inline opus_int32 silk_SMULWB_armv5e(opus_int32 a, opus_int16 b)
46 46
47/* a32 + (b32 * (opus_int32)((opus_int16)(c32))) >> 16 output have to be 32bit int */ 47/* a32 + (b32 * (opus_int32)((opus_int16)(c32))) >> 16 output have to be 32bit int */
48#undef silk_SMLAWB 48#undef silk_SMLAWB
49static inline opus_int32 silk_SMLAWB_armv5e(opus_int32 a, opus_int32 b, 49static OPUS_INLINE opus_int32 silk_SMLAWB_armv5e(opus_int32 a, opus_int32 b,
50 opus_int16 c) 50 opus_int16 c)
51{ 51{
52 int res; 52 int res;
@@ -62,7 +62,7 @@ static inline opus_int32 silk_SMLAWB_armv5e(opus_int32 a, opus_int32 b,
62 62
63/* (a32 * (b32 >> 16)) >> 16 */ 63/* (a32 * (b32 >> 16)) >> 16 */
64#undef silk_SMULWT 64#undef silk_SMULWT
65static inline opus_int32 silk_SMULWT_armv5e(opus_int32 a, opus_int32 b) 65static OPUS_INLINE opus_int32 silk_SMULWT_armv5e(opus_int32 a, opus_int32 b)
66{ 66{
67 int res; 67 int res;
68 __asm__( 68 __asm__(
@@ -77,7 +77,7 @@ static inline opus_int32 silk_SMULWT_armv5e(opus_int32 a, opus_int32 b)
77 77
78/* a32 + (b32 * (c32 >> 16)) >> 16 */ 78/* a32 + (b32 * (c32 >> 16)) >> 16 */
79#undef silk_SMLAWT 79#undef silk_SMLAWT
80static inline opus_int32 silk_SMLAWT_armv5e(opus_int32 a, opus_int32 b, 80static OPUS_INLINE opus_int32 silk_SMLAWT_armv5e(opus_int32 a, opus_int32 b,
81 opus_int32 c) 81 opus_int32 c)
82{ 82{
83 int res; 83 int res;
@@ -93,7 +93,7 @@ static inline opus_int32 silk_SMLAWT_armv5e(opus_int32 a, opus_int32 b,
93 93
94/* (opus_int32)((opus_int16)(a3))) * (opus_int32)((opus_int16)(b32)) output have to be 32bit int */ 94/* (opus_int32)((opus_int16)(a3))) * (opus_int32)((opus_int16)(b32)) output have to be 32bit int */
95#undef silk_SMULBB 95#undef silk_SMULBB
96static inline opus_int32 silk_SMULBB_armv5e(opus_int32 a, opus_int32 b) 96static OPUS_INLINE opus_int32 silk_SMULBB_armv5e(opus_int32 a, opus_int32 b)
97{ 97{
98 int res; 98 int res;
99 __asm__( 99 __asm__(
@@ -108,7 +108,7 @@ static inline opus_int32 silk_SMULBB_armv5e(opus_int32 a, opus_int32 b)
108 108
109/* a32 + (opus_int32)((opus_int16)(b32)) * (opus_int32)((opus_int16)(c32)) output have to be 32bit int */ 109/* a32 + (opus_int32)((opus_int16)(b32)) * (opus_int32)((opus_int16)(c32)) output have to be 32bit int */
110#undef silk_SMLABB 110#undef silk_SMLABB
111static inline opus_int32 silk_SMLABB_armv5e(opus_int32 a, opus_int32 b, 111static OPUS_INLINE opus_int32 silk_SMLABB_armv5e(opus_int32 a, opus_int32 b,
112 opus_int32 c) 112 opus_int32 c)
113{ 113{
114 int res; 114 int res;
@@ -124,7 +124,7 @@ static inline opus_int32 silk_SMLABB_armv5e(opus_int32 a, opus_int32 b,
124 124
125/* (opus_int32)((opus_int16)(a32)) * (b32 >> 16) */ 125/* (opus_int32)((opus_int16)(a32)) * (b32 >> 16) */
126#undef silk_SMULBT 126#undef silk_SMULBT
127static inline opus_int32 silk_SMULBT_armv5e(opus_int32 a, opus_int32 b) 127static OPUS_INLINE opus_int32 silk_SMULBT_armv5e(opus_int32 a, opus_int32 b)
128{ 128{
129 int res; 129 int res;
130 __asm__( 130 __asm__(
@@ -139,7 +139,7 @@ static inline opus_int32 silk_SMULBT_armv5e(opus_int32 a, opus_int32 b)
139 139
140/* a32 + (opus_int32)((opus_int16)(b32)) * (c32 >> 16) */ 140/* a32 + (opus_int32)((opus_int16)(b32)) * (c32 >> 16) */
141#undef silk_SMLABT 141#undef silk_SMLABT
142static inline opus_int32 silk_SMLABT_armv5e(opus_int32 a, opus_int32 b, 142static OPUS_INLINE opus_int32 silk_SMLABT_armv5e(opus_int32 a, opus_int32 b,
143 opus_int32 c) 143 opus_int32 c)
144{ 144{
145 int res; 145 int res;
@@ -155,7 +155,7 @@ static inline opus_int32 silk_SMLABT_armv5e(opus_int32 a, opus_int32 b,
155 155
156/* add/subtract with output saturated */ 156/* add/subtract with output saturated */
157#undef silk_ADD_SAT32 157#undef silk_ADD_SAT32
158static inline opus_int32 silk_ADD_SAT32_armv5e(opus_int32 a, opus_int32 b) 158static OPUS_INLINE opus_int32 silk_ADD_SAT32_armv5e(opus_int32 a, opus_int32 b)
159{ 159{
160 int res; 160 int res;
161 __asm__( 161 __asm__(
@@ -169,7 +169,7 @@ static inline opus_int32 silk_ADD_SAT32_armv5e(opus_int32 a, opus_int32 b)
169#define silk_ADD_SAT32(a, b) (silk_ADD_SAT32_armv5e(a, b)) 169#define silk_ADD_SAT32(a, b) (silk_ADD_SAT32_armv5e(a, b))
170 170
171#undef silk_SUB_SAT32 171#undef silk_SUB_SAT32
172static inline opus_int32 silk_SUB_SAT32_armv5e(opus_int32 a, opus_int32 b) 172static OPUS_INLINE opus_int32 silk_SUB_SAT32_armv5e(opus_int32 a, opus_int32 b)
173{ 173{
174 int res; 174 int res;
175 __asm__( 175 __asm__(
@@ -183,7 +183,7 @@ static inline opus_int32 silk_SUB_SAT32_armv5e(opus_int32 a, opus_int32 b)
183#define silk_SUB_SAT32(a, b) (silk_SUB_SAT32_armv5e(a, b)) 183#define silk_SUB_SAT32(a, b) (silk_SUB_SAT32_armv5e(a, b))
184 184
185#undef silk_CLZ16 185#undef silk_CLZ16
186static inline opus_int32 silk_CLZ16_armv5(opus_int16 in16) 186static OPUS_INLINE opus_int32 silk_CLZ16_armv5(opus_int16 in16)
187{ 187{
188 int res; 188 int res;
189 __asm__( 189 __asm__(
@@ -197,7 +197,7 @@ static inline opus_int32 silk_CLZ16_armv5(opus_int16 in16)
197#define silk_CLZ16(in16) (silk_CLZ16_armv5(in16)) 197#define silk_CLZ16(in16) (silk_CLZ16_armv5(in16))
198 198
199#undef silk_CLZ32 199#undef silk_CLZ32
200static inline opus_int32 silk_CLZ32_armv5(opus_int32 in32) 200static OPUS_INLINE opus_int32 silk_CLZ32_armv5(opus_int32 in32)
201{ 201{
202 int res; 202 int res;
203 __asm__( 203 __asm__(