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/fixed_armv4.h | |
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/fixed_armv4.h')
-rw-r--r-- | lib/rbcodec/codecs/libopus/celt/arm/fixed_armv4.h | 4 |
1 files changed, 2 insertions, 2 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; |