diff options
author | William Wilgus <me.theuser@yahoo.com> | 2019-01-04 02:01:18 -0600 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2021-04-23 14:23:04 +0000 |
commit | 14c6bb798d6bebc80f07e863236adbaf8d156a9c (patch) | |
tree | 551a4b641906c2626af844fa3239c1b2b1ff0ad3 /lib/rbcodec/codecs/libopus/celt/cwrs.c | |
parent | 75d93937965ec4df70d37df6d4feea04577c996b (diff) | |
download | rockbox-14c6bb798d6bebc80f07e863236adbaf8d156a9c.tar.gz rockbox-14c6bb798d6bebc80f07e863236adbaf8d156a9c.zip |
Sync opus codec to upstream git
Change-Id: I0cfcc0005c4ad7bfbb1aaf454188ce70fb043dc1
Diffstat (limited to 'lib/rbcodec/codecs/libopus/celt/cwrs.c')
-rw-r--r-- | lib/rbcodec/codecs/libopus/celt/cwrs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/rbcodec/codecs/libopus/celt/cwrs.c b/lib/rbcodec/codecs/libopus/celt/cwrs.c index 031a875995..a552e4f0fb 100644 --- a/lib/rbcodec/codecs/libopus/celt/cwrs.c +++ b/lib/rbcodec/codecs/libopus/celt/cwrs.c | |||
@@ -74,7 +74,7 @@ int log2_frac(opus_uint32 val, int frac) | |||
74 | /*Although derived separately, the pulse vector coding scheme is equivalent to | 74 | /*Although derived separately, the pulse vector coding scheme is equivalent to |
75 | a Pyramid Vector Quantizer \cite{Fis86}. | 75 | a Pyramid Vector Quantizer \cite{Fis86}. |
76 | Some additional notes about an early version appear at | 76 | Some additional notes about an early version appear at |
77 | http://people.xiph.org/~tterribe/notes/cwrs.html, but the codebook ordering | 77 | https://people.xiph.org/~tterribe/notes/cwrs.html, but the codebook ordering |
78 | and the definitions of some terms have evolved since that was written. | 78 | and the definitions of some terms have evolved since that was written. |
79 | 79 | ||
80 | The conversion from a pulse vector to an integer index (encoding) and back | 80 | The conversion from a pulse vector to an integer index (encoding) and back |
@@ -210,7 +210,7 @@ int log2_frac(opus_uint32 val, int frac) | |||
210 | #if defined(CUSTOM_MODES) | 210 | #if defined(CUSTOM_MODES) |
211 | static const opus_uint32 CELT_PVQ_U_DATA[1488]={ | 211 | static const opus_uint32 CELT_PVQ_U_DATA[1488]={ |
212 | #else | 212 | #else |
213 | static const opus_uint32 CELT_PVQ_U_DATA[1272] ICONST_ATTR ={ | 213 | static const opus_uint32 CELT_PVQ_U_DATA[1272]={ |
214 | #endif | 214 | #endif |
215 | /*N=0, K=0...176:*/ | 215 | /*N=0, K=0...176:*/ |
216 | 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | 216 | 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |
@@ -418,7 +418,7 @@ static 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 | static const opus_uint32 *const CELT_PVQ_U_ROW[15] ICONST_ATTR ={ | 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, |
@@ -482,7 +482,7 @@ static opus_val32 cwrsi(int _n,int _k,opus_uint32 _i,int *_y){ | |||
482 | k0=_k; | 482 | k0=_k; |
483 | q=row[_n]; | 483 | q=row[_n]; |
484 | if(q>_i){ | 484 | if(q>_i){ |
485 | celt_assert(p>q); | 485 | celt_sig_assert(p>q); |
486 | _k=_n; | 486 | _k=_n; |
487 | do p=CELT_PVQ_U_ROW[--_k][_n]; | 487 | do p=CELT_PVQ_U_ROW[--_k][_n]; |
488 | while(p>_i); | 488 | while(p>_i); |