diff options
author | Nils Wallménius <nils@rockbox.org> | 2013-12-11 22:59:14 +0100 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2013-12-16 21:13:23 +0100 |
commit | e3c2ed7a71f65dc721c7210f120259ecd4ff65cb (patch) | |
tree | de593c1e927dcc036f1b6656f1f881995491b3b9 /lib/rbcodec/codecs/libopus/celt/arm | |
parent | d0918b98fa0cfba21208a4fb5ed153687b8f02c3 (diff) | |
download | rockbox-e3c2ed7a71f65dc721c7210f120259ecd4ff65cb.tar.gz rockbox-e3c2ed7a71f65dc721c7210f120259ecd4ff65cb.zip |
Sync libopus to upstream release 1.1
Change-Id: I9fea7460fc33f60faff961b3389dd97b5191463c
Diffstat (limited to 'lib/rbcodec/codecs/libopus/celt/arm')
-rw-r--r-- | lib/rbcodec/codecs/libopus/celt/arm/fixed_armv4.h | 4 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libopus/celt/arm/fixed_armv5e.h | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/rbcodec/codecs/libopus/celt/arm/fixed_armv4.h b/lib/rbcodec/codecs/libopus/celt/arm/fixed_armv4.h index bcacc343e8..b690bc8cea 100644 --- a/lib/rbcodec/codecs/libopus/celt/arm/fixed_armv4.h +++ b/lib/rbcodec/codecs/libopus/celt/arm/fixed_armv4.h | |||
@@ -29,7 +29,7 @@ | |||
29 | 29 | ||
30 | /** 16x32 multiplication, followed by a 16-bit shift right. Results fits in 32 bits */ | 30 | /** 16x32 multiplication, followed by a 16-bit shift right. Results fits in 32 bits */ |
31 | #undef MULT16_32_Q16 | 31 | #undef MULT16_32_Q16 |
32 | static inline opus_val32 MULT16_32_Q16_armv4(opus_val16 a, opus_val32 b) | 32 | static OPUS_INLINE opus_val32 MULT16_32_Q16_armv4(opus_val16 a, opus_val32 b) |
33 | { | 33 | { |
34 | unsigned rd_lo; | 34 | unsigned rd_lo; |
35 | int rd_hi; | 35 | int rd_hi; |
@@ -46,7 +46,7 @@ static inline opus_val32 MULT16_32_Q16_armv4(opus_val16 a, opus_val32 b) | |||
46 | 46 | ||
47 | /** 16x32 multiplication, followed by a 15-bit shift right. Results fits in 32 bits */ | 47 | /** 16x32 multiplication, followed by a 15-bit shift right. Results fits in 32 bits */ |
48 | #undef MULT16_32_Q15 | 48 | #undef MULT16_32_Q15 |
49 | static inline opus_val32 MULT16_32_Q15_armv4(opus_val16 a, opus_val32 b) | 49 | static OPUS_INLINE opus_val32 MULT16_32_Q15_armv4(opus_val16 a, opus_val32 b) |
50 | { | 50 | { |
51 | unsigned rd_lo; | 51 | unsigned rd_lo; |
52 | int rd_hi; | 52 | int rd_hi; |
diff --git a/lib/rbcodec/codecs/libopus/celt/arm/fixed_armv5e.h b/lib/rbcodec/codecs/libopus/celt/arm/fixed_armv5e.h index 80632c4a94..1194a7d3ec 100644 --- a/lib/rbcodec/codecs/libopus/celt/arm/fixed_armv5e.h +++ b/lib/rbcodec/codecs/libopus/celt/arm/fixed_armv5e.h | |||
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | /** 16x32 multiplication, followed by a 16-bit shift right. Results fits in 32 bits */ | 35 | /** 16x32 multiplication, followed by a 16-bit shift right. Results fits in 32 bits */ |
36 | #undef MULT16_32_Q16 | 36 | #undef MULT16_32_Q16 |
37 | static inline opus_val32 MULT16_32_Q16_armv5e(opus_val16 a, opus_val32 b) | 37 | static OPUS_INLINE opus_val32 MULT16_32_Q16_armv5e(opus_val16 a, opus_val32 b) |
38 | { | 38 | { |
39 | int res; | 39 | int res; |
40 | __asm__( | 40 | __asm__( |
@@ -50,7 +50,7 @@ static inline opus_val32 MULT16_32_Q16_armv5e(opus_val16 a, opus_val32 b) | |||
50 | 50 | ||
51 | /** 16x32 multiplication, followed by a 15-bit shift right. Results fits in 32 bits */ | 51 | /** 16x32 multiplication, followed by a 15-bit shift right. Results fits in 32 bits */ |
52 | #undef MULT16_32_Q15 | 52 | #undef MULT16_32_Q15 |
53 | static inline opus_val32 MULT16_32_Q15_armv5e(opus_val16 a, opus_val32 b) | 53 | static OPUS_INLINE opus_val32 MULT16_32_Q15_armv5e(opus_val16 a, opus_val32 b) |
54 | { | 54 | { |
55 | int res; | 55 | int res; |
56 | __asm__( | 56 | __asm__( |
@@ -68,7 +68,7 @@ static inline opus_val32 MULT16_32_Q15_armv5e(opus_val16 a, opus_val32 b) | |||
68 | b must fit in 31 bits. | 68 | b must fit in 31 bits. |
69 | Result fits in 32 bits. */ | 69 | Result fits in 32 bits. */ |
70 | #undef MAC16_32_Q15 | 70 | #undef MAC16_32_Q15 |
71 | static inline opus_val32 MAC16_32_Q15_armv5e(opus_val32 c, opus_val16 a, | 71 | static OPUS_INLINE opus_val32 MAC16_32_Q15_armv5e(opus_val32 c, opus_val16 a, |
72 | opus_val32 b) | 72 | opus_val32 b) |
73 | { | 73 | { |
74 | int res; | 74 | int res; |
@@ -84,7 +84,7 @@ static inline opus_val32 MAC16_32_Q15_armv5e(opus_val32 c, opus_val16 a, | |||
84 | 84 | ||
85 | /** 16x16 multiply-add where the result fits in 32 bits */ | 85 | /** 16x16 multiply-add where the result fits in 32 bits */ |
86 | #undef MAC16_16 | 86 | #undef MAC16_16 |
87 | static inline opus_val32 MAC16_16_armv5e(opus_val32 c, opus_val16 a, | 87 | static OPUS_INLINE opus_val32 MAC16_16_armv5e(opus_val32 c, opus_val16 a, |
88 | opus_val16 b) | 88 | opus_val16 b) |
89 | { | 89 | { |
90 | int res; | 90 | int res; |
@@ -100,7 +100,7 @@ static inline opus_val32 MAC16_16_armv5e(opus_val32 c, opus_val16 a, | |||
100 | 100 | ||
101 | /** 16x16 multiplication where the result fits in 32 bits */ | 101 | /** 16x16 multiplication where the result fits in 32 bits */ |
102 | #undef MULT16_16 | 102 | #undef MULT16_16 |
103 | static inline opus_val32 MULT16_16_armv5e(opus_val16 a, opus_val16 b) | 103 | static OPUS_INLINE opus_val32 MULT16_16_armv5e(opus_val16 a, opus_val16 b) |
104 | { | 104 | { |
105 | int res; | 105 | int res; |
106 | __asm__( | 106 | __asm__( |