eden-emu/opus
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes a stereo rate mismatch bug

Browse source 
This is a tentative fix for a bug found in fuzzing where the encoder
switched from mono to stereo while in the process of changing bandwidth.
The result was that the newly added side would use the new sampling
rate, while the mid hadn't switched yet, causing an encoder/decoder
mismatch. The fix is that the side rate selection gets overridden
to use the mid rate.
The bug would occur when compiling with fuzzing enabled and using:
./test_opus 0 48000 2 24000 input.sw output.sw
This commit is contained in:
Jean-Marc Valin 2011-08-12 16:17:27 -04:00
parent b288c5078a
commit 3120e225c2
4 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
silk/fixed/silk_main_FIX.h
View file

@ -81,7 +81,8 @@ opus_int silk_control_encoder(
silk_EncControlStruct *encControl, /* I: Control structure */ silk_EncControlStruct *encControl, /* I: Control structure */
const opus_int32 TargetRate_bps, /* I Target max bitrate (bps) */ const opus_int32 TargetRate_bps, /* I Target max bitrate (bps) */
const opus_int allow_bw_switch, /* I Flag to allow switching audio bandwidth */ const opus_int allow_bw_switch, /* I Flag to allow switching audio bandwidth */
const opus_int channelNb /* I Channel number */ const opus_int channelNb, /* I Channel number */
const opus_int force_fs_kHz
); );
/****************/ /****************/

3
silk/float/silk_main_FLP.h
View file

@ -79,7 +79,8 @@ opus_int silk_control_encoder(
silk_EncControlStruct *encControl, /* I: Control structure */ silk_EncControlStruct *encControl, /* I: Control structure */
const opus_int32 TargetRate_bps, /* I Target max bitrate (bps) */ const opus_int32 TargetRate_bps, /* I Target max bitrate (bps) */
const opus_int allow_bw_switch, /* I Flag to allow switching audio bandwidth */ const opus_int allow_bw_switch, /* I Flag to allow switching audio bandwidth */
const opus_int channelNb /* I Channel number */ const opus_int channelNb, /* I Channel number */
const opus_int force_fs_kHz
); );
/****************/ /****************/

6
silk/silk_control_codec.c
View file

@ -65,7 +65,8 @@ opus_int silk_control_encoder(
silk_EncControlStruct *encControl, /* I: Control structure */ silk_EncControlStruct *encControl, /* I: Control structure */
const opus_int32 TargetRate_bps, /* I Target max bitrate (bps) */ const opus_int32 TargetRate_bps, /* I Target max bitrate (bps) */
const opus_int allow_bw_switch, /* I Flag to allow switching audio bandwidth */ const opus_int allow_bw_switch, /* I Flag to allow switching audio bandwidth */
const opus_int channelNb /* I Channel number */ const opus_int channelNb, /* I Channel number */
const opus_int force_fs_kHz
) )
{ {
opus_int fs_kHz, ret = 0; opus_int fs_kHz, ret = 0;
@ -96,7 +97,8 @@ opus_int silk_control_encoder(
/* Determine internal sampling rate */ /* Determine internal sampling rate */
/********************************************/ /********************************************/
fs_kHz = silk_control_audio_bandwidth( &psEnc->sCmn ); fs_kHz = silk_control_audio_bandwidth( &psEnc->sCmn );
if (force_fs_kHz)
fs_kHz = force_fs_kHz;
/********************************************/ /********************************************/
/* Prepare resampler and buffered data */ /* Prepare resampler and buffered data */
/********************************************/ /********************************************/

4
silk/silk_enc_API.c
View file

@ -201,7 +201,9 @@ opus_int silk_Encode(
TargetRate_bps = SKP_RSHIFT32( encControl->bitRate, encControl->nChannelsInternal - 1 ); TargetRate_bps = SKP_RSHIFT32( encControl->bitRate, encControl->nChannelsInternal - 1 );
for( n = 0; n < encControl->nChannelsInternal; n++ ) { for( n = 0; n < encControl->nChannelsInternal; n++ ) {
if( ( ret = silk_control_encoder( &psEnc->state_Fxx[ n ], encControl, TargetRate_bps, psEnc->allowBandwidthSwitch, n ) ) != 0 ) { /* JMV: Force the side channel to the same rate as the mid. Is this the right way? */
int force_fs_kHz = (n==1) ? psEnc->state_Fxx[0].sCmn.fs_kHz : 0;
if( ( ret = silk_control_encoder( &psEnc->state_Fxx[ n ], encControl, TargetRate_bps, psEnc->allowBandwidthSwitch, n, force_fs_kHz ) ) != 0 ) {
SKP_assert( 0 ); SKP_assert( 0 );
return ret; return ret;
} }