Index: third_party/opus/src/celt/arch.h |
diff --git a/third_party/opus/src/celt/arch.h b/third_party/opus/src/celt/arch.h |
index 8ceab5fe10e934113592ade9339939771f4a2a01..d1e6457c54a07c6ec5c3a030510da8ab42355008 100644 |
--- a/third_party/opus/src/celt/arch.h |
+++ b/third_party/opus/src/celt/arch.h |
@@ -46,6 +46,14 @@ |
# endif |
# endif |
+#if OPUS_GNUC_PREREQ(3, 0) |
+#define opus_likely(x) (__builtin_expect(!!(x), 1)) |
+#define opus_unlikely(x) (__builtin_expect(!!(x), 0)) |
+#else |
+#define opus_likely(x) (!!(x)) |
+#define opus_unlikely(x) (!!(x)) |
+#endif |
+ |
#define CELT_SIG_SCALE 32768.f |
#define celt_fatal(str) _celt_fatal(str, __FILE__, __LINE__); |
@@ -93,6 +101,7 @@ static OPUS_INLINE void _celt_fatal(const char *str, const char *file, int line) |
typedef opus_int16 opus_val16; |
typedef opus_int32 opus_val32; |
+typedef opus_int64 opus_val64; |
typedef opus_val32 celt_sig; |
typedef opus_val16 celt_norm; |
@@ -101,6 +110,9 @@ typedef opus_val32 celt_ener; |
#define Q15ONE 32767 |
#define SIG_SHIFT 12 |
+/* Safe saturation value for 32-bit signals. Should be less than |
+ 2^31*(1-0.85) to avoid blowing up on DC at deemphasis.*/ |
+#define SIG_SAT (300000000) |
#define NORM_SCALING 16384 |
@@ -147,6 +159,7 @@ static OPUS_INLINE opus_int16 SAT16(opus_int32 x) { |
typedef float opus_val16; |
typedef float opus_val32; |
+typedef float opus_val64; |
typedef float celt_sig; |
typedef float celt_norm; |
@@ -186,6 +199,7 @@ static OPUS_INLINE int celt_isnan(float x) |
#define NEG16(x) (-(x)) |
#define NEG32(x) (-(x)) |
+#define NEG32_ovflw(x) (-(x)) |
#define EXTRACT16(x) (x) |
#define EXTEND32(x) (x) |
#define SHR16(a,shift) (a) |
@@ -202,6 +216,7 @@ static OPUS_INLINE int celt_isnan(float x) |
#define SATURATE16(x) (x) |
#define ROUND16(a,shift) (a) |
+#define SROUND16(a,shift) (a) |
#define HALF16(x) (.5f*(x)) |
#define HALF32(x) (.5f*(x)) |
@@ -209,6 +224,8 @@ static OPUS_INLINE int celt_isnan(float x) |
#define SUB16(a,b) ((a)-(b)) |
#define ADD32(a,b) ((a)+(b)) |
#define SUB32(a,b) ((a)-(b)) |
+#define ADD32_ovflw(a,b) ((a)+(b)) |
+#define SUB32_ovflw(a,b) ((a)-(b)) |
#define MULT16_16_16(a,b) ((a)*(b)) |
#define MULT16_16(a,b) ((opus_val32)(a)*(opus_val32)(b)) |
#define MAC16_16(c,a,b) ((c)+(opus_val32)(a)*(opus_val32)(b)) |
@@ -243,9 +260,9 @@ static OPUS_INLINE int celt_isnan(float x) |
#ifndef GLOBAL_STACK_SIZE |
#ifdef FIXED_POINT |
-#define GLOBAL_STACK_SIZE 100000 |
+#define GLOBAL_STACK_SIZE 120000 |
#else |
-#define GLOBAL_STACK_SIZE 100000 |
+#define GLOBAL_STACK_SIZE 120000 |
#endif |
#endif |