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/cwrs.c | |
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/cwrs.c')
-rw-r--r-- | lib/rbcodec/codecs/libopus/celt/cwrs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/rbcodec/codecs/libopus/celt/cwrs.c b/lib/rbcodec/codecs/libopus/celt/cwrs.c index eb8fa1c807..03b86985d2 100644 --- a/lib/rbcodec/codecs/libopus/celt/cwrs.c +++ b/lib/rbcodec/codecs/libopus/celt/cwrs.c | |||
@@ -410,7 +410,7 @@ static const opus_uint32 CELT_PVQ_U_DATA[1272] ICONST_ATTR ={ | |||
410 | }; | 410 | }; |
411 | 411 | ||
412 | #if defined(CUSTOM_MODES) | 412 | #if defined(CUSTOM_MODES) |
413 | const opus_uint32 *const CELT_PVQ_U_ROW[15]={ | 413 | static const opus_uint32 *const CELT_PVQ_U_ROW[15]={ |
414 | CELT_PVQ_U_DATA+ 0,CELT_PVQ_U_DATA+ 208,CELT_PVQ_U_DATA+ 415, | 414 | CELT_PVQ_U_DATA+ 0,CELT_PVQ_U_DATA+ 208,CELT_PVQ_U_DATA+ 415, |
415 | CELT_PVQ_U_DATA+ 621,CELT_PVQ_U_DATA+ 826,CELT_PVQ_U_DATA+1030, | 415 | CELT_PVQ_U_DATA+ 621,CELT_PVQ_U_DATA+ 826,CELT_PVQ_U_DATA+1030, |
416 | CELT_PVQ_U_DATA+1233,CELT_PVQ_U_DATA+1336,CELT_PVQ_U_DATA+1389, | 416 | CELT_PVQ_U_DATA+1233,CELT_PVQ_U_DATA+1336,CELT_PVQ_U_DATA+1389, |
@@ -418,7 +418,7 @@ const opus_uint32 *const CELT_PVQ_U_ROW[15]={ | |||
418 | CELT_PVQ_U_DATA+1464,CELT_PVQ_U_DATA+1470,CELT_PVQ_U_DATA+1473 | 418 | CELT_PVQ_U_DATA+1464,CELT_PVQ_U_DATA+1470,CELT_PVQ_U_DATA+1473 |
419 | }; | 419 | }; |
420 | #else | 420 | #else |
421 | const opus_uint32 *const CELT_PVQ_U_ROW[15]={ | 421 | static const opus_uint32 *const CELT_PVQ_U_ROW[15]={ |
422 | CELT_PVQ_U_DATA+ 0,CELT_PVQ_U_DATA+ 176,CELT_PVQ_U_DATA+ 351, | 422 | CELT_PVQ_U_DATA+ 0,CELT_PVQ_U_DATA+ 176,CELT_PVQ_U_DATA+ 351, |
423 | CELT_PVQ_U_DATA+ 525,CELT_PVQ_U_DATA+ 698,CELT_PVQ_U_DATA+ 870, | 423 | CELT_PVQ_U_DATA+ 525,CELT_PVQ_U_DATA+ 698,CELT_PVQ_U_DATA+ 870, |
424 | CELT_PVQ_U_DATA+1041,CELT_PVQ_U_DATA+1131,CELT_PVQ_U_DATA+1178, | 424 | CELT_PVQ_U_DATA+1041,CELT_PVQ_U_DATA+1131,CELT_PVQ_U_DATA+1178, |
@@ -534,7 +534,7 @@ void decode_pulses(int *_y,int _n,int _k,ec_dec *_dec){ | |||
534 | /*Computes the next row/column of any recurrence that obeys the relation | 534 | /*Computes the next row/column of any recurrence that obeys the relation |
535 | u[i][j]=u[i-1][j]+u[i][j-1]+u[i-1][j-1]. | 535 | u[i][j]=u[i-1][j]+u[i][j-1]+u[i-1][j-1]. |
536 | _ui0 is the base case for the new row/column.*/ | 536 | _ui0 is the base case for the new row/column.*/ |
537 | static inline void unext(opus_uint32 *_ui,unsigned _len,opus_uint32 _ui0){ | 537 | static OPUS_INLINE void unext(opus_uint32 *_ui,unsigned _len,opus_uint32 _ui0){ |
538 | opus_uint32 ui1; | 538 | opus_uint32 ui1; |
539 | unsigned j; | 539 | unsigned j; |
540 | /*This do-while will overrun the array if we don't have storage for at least | 540 | /*This do-while will overrun the array if we don't have storage for at least |
@@ -550,7 +550,7 @@ static inline void unext(opus_uint32 *_ui,unsigned _len,opus_uint32 _ui0){ | |||
550 | /*Computes the previous row/column of any recurrence that obeys the relation | 550 | /*Computes the previous row/column of any recurrence that obeys the relation |
551 | u[i-1][j]=u[i][j]-u[i][j-1]-u[i-1][j-1]. | 551 | u[i-1][j]=u[i][j]-u[i][j-1]-u[i-1][j-1]. |
552 | _ui0 is the base case for the new row/column.*/ | 552 | _ui0 is the base case for the new row/column.*/ |
553 | static inline void uprev(opus_uint32 *_ui,unsigned _n,opus_uint32 _ui0){ | 553 | static OPUS_INLINE void uprev(opus_uint32 *_ui,unsigned _n,opus_uint32 _ui0){ |
554 | opus_uint32 ui1; | 554 | opus_uint32 ui1; |
555 | unsigned j; | 555 | unsigned j; |
556 | /*This do-while will overrun the array if we don't have storage for at least | 556 | /*This do-while will overrun the array if we don't have storage for at least |
@@ -617,7 +617,7 @@ static void cwrsi(int _n,int _k,opus_uint32 _i,int *_y,opus_uint32 *_u){ | |||
617 | of size 1 with associated sign bits. | 617 | of size 1 with associated sign bits. |
618 | _y: The vector of pulses, whose sum of absolute values is K. | 618 | _y: The vector of pulses, whose sum of absolute values is K. |
619 | _k: Returns K.*/ | 619 | _k: Returns K.*/ |
620 | static inline opus_uint32 icwrs1(const int *_y,int *_k){ | 620 | static OPUS_INLINE opus_uint32 icwrs1(const int *_y,int *_k){ |
621 | *_k=abs(_y[0]); | 621 | *_k=abs(_y[0]); |
622 | return _y[0]<0; | 622 | return _y[0]<0; |
623 | } | 623 | } |
@@ -626,7 +626,7 @@ static inline opus_uint32 icwrs1(const int *_y,int *_k){ | |||
626 | of size _n with associated sign bits. | 626 | of size _n with associated sign bits. |
627 | _y: The vector of pulses, whose sum of absolute values must be _k. | 627 | _y: The vector of pulses, whose sum of absolute values must be _k. |
628 | _nc: Returns V(_n,_k).*/ | 628 | _nc: Returns V(_n,_k).*/ |
629 | static inline opus_uint32 icwrs(int _n,int _k,opus_uint32 *_nc,const int *_y, | 629 | static OPUS_INLINE opus_uint32 icwrs(int _n,int _k,opus_uint32 *_nc,const int *_y, |
630 | opus_uint32 *_u){ | 630 | opus_uint32 *_u){ |
631 | opus_uint32 i; | 631 | opus_uint32 i; |
632 | int j; | 632 | int j; |