eden-emu/opus
15
0
Fork 0
mirror of https://github.com/xiph/opus.git synced 2025-05-31 23:57:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixes a bug on FEC+stereo

Browse source 
When FEC is enabled in the decoder but not included in the bit-stream
we could end up applying the PLC on a non-existant side.
This commit is contained in:
Jean-Marc Valin 2011-10-24 20:07:00 -04:00
parent a7585a0dd1
commit ec1ebf8ad7
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
silk/dec_API.c
View file

@ -89,6 +89,7 @@ opus_int silk_Decode(
opus_int16 *resample_out_ptr; opus_int16 *resample_out_ptr;
silk_decoder *psDec = ( silk_decoder * )decState; silk_decoder *psDec = ( silk_decoder * )decState;
silk_decoder_state *channel_state = psDec->channel_state; silk_decoder_state *channel_state = psDec->channel_state;
opus_int has_side;
/**********************************/ /**********************************/
/* Test if first frame in payload */ /* Test if first frame in payload */
@ -236,9 +237,15 @@ opus_int silk_Decode(
psDec->channel_state[ 1 ].first_frame_after_reset = 1; psDec->channel_state[ 1 ].first_frame_after_reset = 1;
} }
if (lostFlag == FLAG_DECODE_NORMAL) {
has_side = !decode_only_middle;
} else {
has_side = !psDec->prev_decode_only_middle
|| (decControl->nChannelsInternal == 2 && lostFlag == FLAG_DECODE_LBRR && channel_state[1].LBRR_flags[ channel_state[1].nFramesDecoded ] == 1 );
}
/* Call decoder for one frame */ /* Call decoder for one frame */
for( n = 0; n < decControl->nChannelsInternal; n++ ) { for( n = 0; n < decControl->nChannelsInternal; n++ ) {
if( n == 0 || ( ( lostFlag != FLAG_PACKET_LOST ? decode_only_middle : psDec->prev_decode_only_middle ) == 0 ) ) { if( n == 0 || has_side ) {
opus_int FrameIndex; opus_int FrameIndex;
opus_int condCoding; opus_int condCoding;