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/dec_API.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/dec_API.c')
-rw-r--r-- | lib/rbcodec/codecs/libopus/silk/dec_API.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/rbcodec/codecs/libopus/silk/dec_API.c b/lib/rbcodec/codecs/libopus/silk/dec_API.c index 1087c6726a..7d5ca7fb9f 100644 --- a/lib/rbcodec/codecs/libopus/silk/dec_API.c +++ b/lib/rbcodec/codecs/libopus/silk/dec_API.c | |||
@@ -85,7 +85,8 @@ opus_int silk_Decode( /* O Returns error co | |||
85 | opus_int newPacketFlag, /* I Indicates first decoder call for this packet */ | 85 | opus_int newPacketFlag, /* I Indicates first decoder call for this packet */ |
86 | ec_dec *psRangeDec, /* I/O Compressor data structure */ | 86 | ec_dec *psRangeDec, /* I/O Compressor data structure */ |
87 | opus_int16 *samplesOut, /* O Decoded output speech vector */ | 87 | opus_int16 *samplesOut, /* O Decoded output speech vector */ |
88 | opus_int32 *nSamplesOut /* O Number of samples decoded */ | 88 | opus_int32 *nSamplesOut, /* O Number of samples decoded */ |
89 | int arch /* I Run-time architecture */ | ||
89 | ) | 90 | ) |
90 | { | 91 | { |
91 | opus_int i, n, decode_only_middle = 0, ret = SILK_NO_ERROR; | 92 | opus_int i, n, decode_only_middle = 0, ret = SILK_NO_ERROR; |
@@ -103,7 +104,7 @@ opus_int silk_Decode( /* O Returns error co | |||
103 | int delay_stack_alloc; | 104 | int delay_stack_alloc; |
104 | SAVE_STACK; | 105 | SAVE_STACK; |
105 | 106 | ||
106 | silk_assert( decControl->nChannelsInternal == 1 || decControl->nChannelsInternal == 2 ); | 107 | celt_assert( decControl->nChannelsInternal == 1 || decControl->nChannelsInternal == 2 ); |
107 | 108 | ||
108 | /**********************************/ | 109 | /**********************************/ |
109 | /* Test if first frame in payload */ | 110 | /* Test if first frame in payload */ |
@@ -142,13 +143,13 @@ opus_int silk_Decode( /* O Returns error co | |||
142 | channel_state[ n ].nFramesPerPacket = 3; | 143 | channel_state[ n ].nFramesPerPacket = 3; |
143 | channel_state[ n ].nb_subfr = 4; | 144 | channel_state[ n ].nb_subfr = 4; |
144 | } else { | 145 | } else { |
145 | silk_assert( 0 ); | 146 | celt_assert( 0 ); |
146 | RESTORE_STACK; | 147 | RESTORE_STACK; |
147 | return SILK_DEC_INVALID_FRAME_SIZE; | 148 | return SILK_DEC_INVALID_FRAME_SIZE; |
148 | } | 149 | } |
149 | fs_kHz_dec = ( decControl->internalSampleRate >> 10 ) + 1; | 150 | fs_kHz_dec = ( decControl->internalSampleRate >> 10 ) + 1; |
150 | if( fs_kHz_dec != 8 && fs_kHz_dec != 12 && fs_kHz_dec != 16 ) { | 151 | if( fs_kHz_dec != 8 && fs_kHz_dec != 12 && fs_kHz_dec != 16 ) { |
151 | silk_assert( 0 ); | 152 | celt_assert( 0 ); |
152 | RESTORE_STACK; | 153 | RESTORE_STACK; |
153 | return SILK_DEC_INVALID_SAMPLING_FREQUENCY; | 154 | return SILK_DEC_INVALID_SAMPLING_FREQUENCY; |
154 | } | 155 | } |
@@ -296,7 +297,7 @@ opus_int silk_Decode( /* O Returns error co | |||
296 | } else { | 297 | } else { |
297 | condCoding = CODE_CONDITIONALLY; | 298 | condCoding = CODE_CONDITIONALLY; |
298 | } | 299 | } |
299 | ret += silk_decode_frame( &channel_state[ n ], psRangeDec, &samplesOut1_tmp[ n ][ 2 ], &nSamplesOutDec, lostFlag, condCoding); | 300 | ret += silk_decode_frame( &channel_state[ n ], psRangeDec, &samplesOut1_tmp[ n ][ 2 ], &nSamplesOutDec, lostFlag, condCoding, arch); |
300 | } else { | 301 | } else { |
301 | silk_memset( &samplesOut1_tmp[ n ][ 2 ], 0, nSamplesOutDec * sizeof( opus_int16 ) ); | 302 | silk_memset( &samplesOut1_tmp[ n ][ 2 ], 0, nSamplesOutDec * sizeof( opus_int16 ) ); |
302 | } | 303 | } |