diff options
Diffstat (limited to 'lib/rbcodec/codecs/libopus/silk/macros.h')
-rw-r--r-- | lib/rbcodec/codecs/libopus/silk/macros.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/rbcodec/codecs/libopus/silk/macros.h b/lib/rbcodec/codecs/libopus/silk/macros.h index 482dc3c6eb..05623b5df8 100644 --- a/lib/rbcodec/codecs/libopus/silk/macros.h +++ b/lib/rbcodec/codecs/libopus/silk/macros.h | |||
@@ -79,17 +79,24 @@ POSSIBILITY OF SUCH DAMAGE. | |||
79 | (( (a) & ((b)^0x80000000) & 0x80000000) ? silk_int32_MIN : (a)-(b)) : \ | 79 | (( (a) & ((b)^0x80000000) & 0x80000000) ? silk_int32_MIN : (a)-(b)) : \ |
80 | ((((a)^0x80000000) & (b) & 0x80000000) ? silk_int32_MAX : (a)-(b)) ) | 80 | ((((a)^0x80000000) & (b) & 0x80000000) ? silk_int32_MAX : (a)-(b)) ) |
81 | 81 | ||
82 | #include "ecintrin.h" | 82 | #if defined(MIPSr1_ASM) |
83 | #include "mips/macros_mipsr1.h" | ||
84 | #endif | ||
83 | 85 | ||
86 | #include "ecintrin.h" | ||
87 | #ifndef OVERRIDE_silk_CLZ16 | ||
84 | static OPUS_INLINE opus_int32 silk_CLZ16(opus_int16 in16) | 88 | static OPUS_INLINE opus_int32 silk_CLZ16(opus_int16 in16) |
85 | { | 89 | { |
86 | return 32 - EC_ILOG(in16<<16|0x8000); | 90 | return 32 - EC_ILOG(in16<<16|0x8000); |
87 | } | 91 | } |
92 | #endif | ||
88 | 93 | ||
94 | #ifndef OVERRIDE_silk_CLZ32 | ||
89 | static OPUS_INLINE opus_int32 silk_CLZ32(opus_int32 in32) | 95 | static OPUS_INLINE opus_int32 silk_CLZ32(opus_int32 in32) |
90 | { | 96 | { |
91 | return in32 ? 32 - EC_ILOG(in32) : 32; | 97 | return in32 ? 32 - EC_ILOG(in32) : 32; |
92 | } | 98 | } |
99 | #endif | ||
93 | 100 | ||
94 | /* Row based */ | 101 | /* Row based */ |
95 | #define matrix_ptr(Matrix_base_adr, row, column, N) \ | 102 | #define matrix_ptr(Matrix_base_adr, row, column, N) \ |