summaryrefslogtreecommitdiff
path: root/lib/rbcodec/codecs/libopus/celt/rate.h
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2013-12-11 22:59:14 +0100
committerNils Wallménius <nils@rockbox.org>2013-12-16 21:13:23 +0100
commite3c2ed7a71f65dc721c7210f120259ecd4ff65cb (patch)
treede593c1e927dcc036f1b6656f1f881995491b3b9 /lib/rbcodec/codecs/libopus/celt/rate.h
parentd0918b98fa0cfba21208a4fb5ed153687b8f02c3 (diff)
downloadrockbox-e3c2ed7a71f65dc721c7210f120259ecd4ff65cb.tar.gz
rockbox-e3c2ed7a71f65dc721c7210f120259ecd4ff65cb.zip
Sync libopus to upstream release 1.1
Change-Id: I9fea7460fc33f60faff961b3389dd97b5191463c
Diffstat (limited to 'lib/rbcodec/codecs/libopus/celt/rate.h')
-rw-r--r--lib/rbcodec/codecs/libopus/celt/rate.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/rbcodec/codecs/libopus/celt/rate.h b/lib/rbcodec/codecs/libopus/celt/rate.h
index 263fde9820..f1e0661129 100644
--- a/lib/rbcodec/codecs/libopus/celt/rate.h
+++ b/lib/rbcodec/codecs/libopus/celt/rate.h
@@ -45,12 +45,12 @@
45 45
46void compute_pulse_cache(CELTMode *m, int LM); 46void compute_pulse_cache(CELTMode *m, int LM);
47 47
48static inline int get_pulses(int i) 48static OPUS_INLINE int get_pulses(int i)
49{ 49{
50 return i<8 ? i : (8 + (i&7)) << ((i>>3)-1); 50 return i<8 ? i : (8 + (i&7)) << ((i>>3)-1);
51} 51}
52 52
53static inline int bits2pulses(const CELTMode *m, int band, int LM, int bits) 53static OPUS_INLINE int bits2pulses(const CELTMode *m, int band, int LM, int bits)
54{ 54{
55 int i; 55 int i;
56 int lo, hi; 56 int lo, hi;
@@ -77,7 +77,7 @@ static inline int bits2pulses(const CELTMode *m, int band, int LM, int bits)
77 return hi; 77 return hi;
78} 78}
79 79
80static inline int pulses2bits(const CELTMode *m, int band, int LM, int pulses) 80static OPUS_INLINE int pulses2bits(const CELTMode *m, int band, int LM, int pulses)
81{ 81{
82 const unsigned char *cache; 82 const unsigned char *cache;
83 83