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/silk/decode_pulses.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/silk/decode_pulses.c')
-rw-r--r-- | lib/rbcodec/codecs/libopus/silk/decode_pulses.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/rbcodec/codecs/libopus/silk/decode_pulses.c b/lib/rbcodec/codecs/libopus/silk/decode_pulses.c index 1e14bc37b4..a56d2d3074 100644 --- a/lib/rbcodec/codecs/libopus/silk/decode_pulses.c +++ b/lib/rbcodec/codecs/libopus/silk/decode_pulses.c | |||
@@ -56,7 +56,7 @@ void silk_decode_pulses( | |||
56 | silk_assert( 1 << LOG2_SHELL_CODEC_FRAME_LENGTH == SHELL_CODEC_FRAME_LENGTH ); | 56 | silk_assert( 1 << LOG2_SHELL_CODEC_FRAME_LENGTH == SHELL_CODEC_FRAME_LENGTH ); |
57 | iter = silk_RSHIFT( frame_length, LOG2_SHELL_CODEC_FRAME_LENGTH ); | 57 | iter = silk_RSHIFT( frame_length, LOG2_SHELL_CODEC_FRAME_LENGTH ); |
58 | if( iter * SHELL_CODEC_FRAME_LENGTH < frame_length ) { | 58 | if( iter * SHELL_CODEC_FRAME_LENGTH < frame_length ) { |
59 | silk_assert( frame_length == 12 * 10 ); /* Make sure only happens for 10 ms @ 12 kHz */ | 59 | celt_assert( frame_length == 12 * 10 ); /* Make sure only happens for 10 ms @ 12 kHz */ |
60 | iter++; | 60 | iter++; |
61 | } | 61 | } |
62 | 62 | ||
@@ -69,9 +69,9 @@ void silk_decode_pulses( | |||
69 | sum_pulses[ i ] = ec_dec_icdf( psRangeDec, cdf_ptr, 8 ); | 69 | sum_pulses[ i ] = ec_dec_icdf( psRangeDec, cdf_ptr, 8 ); |
70 | 70 | ||
71 | /* LSB indication */ | 71 | /* LSB indication */ |
72 | while( sum_pulses[ i ] == MAX_PULSES + 1 ) { | 72 | while( sum_pulses[ i ] == SILK_MAX_PULSES + 1 ) { |
73 | nLshifts[ i ]++; | 73 | nLshifts[ i ]++; |
74 | /* When we've already got 10 LSBs, we shift the table to not allow (MAX_PULSES + 1) */ | 74 | /* When we've already got 10 LSBs, we shift the table to not allow (SILK_MAX_PULSES + 1) */ |
75 | sum_pulses[ i ] = ec_dec_icdf( psRangeDec, | 75 | sum_pulses[ i ] = ec_dec_icdf( psRangeDec, |
76 | silk_pulses_per_block_iCDF[ N_RATE_LEVELS - 1] + ( nLshifts[ i ] == 10 ), 8 ); | 76 | silk_pulses_per_block_iCDF[ N_RATE_LEVELS - 1] + ( nLshifts[ i ] == 10 ), 8 ); |
77 | } | 77 | } |