diff --git a/lib_com/options.h b/lib_com/options.h index fba3ebf3a5a663d663dc1fb1a706b98c26c4539d..1ed9f1662cbc370f047bb3446cccc9ba67df9e8a 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -158,15 +158,13 @@ #define NONBE_FIX_984_OMASA_EXT_OUTPUT /* Nokia: issue #984: complete the OMASA EXT output implementation */ #define USE_NEW_HRTF_BINARY_FILE_FORMAT /* Orange: to activate when decided to change the hrtf binary file format */ - #define FIX_WARNING_RENDER_CONFIG /* Orange: fix warning on windows build */ - #define NONBE_FIX_991_PARAMBIN_BINARY_HRTF /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to activate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on ) */ - #define FIX_1741_REVERB_TIMES_Q_FORMAT /* Philips: reverberation times in Q26 format instead of Q31 */ #define FIX_1831_REVERB_REGRESSION /* Philips: fixes reverb regression issues */ - #define FIX_1835_REVERB_ACTIVATION /* FhG: Modified reverberation activation logic and corrected factEQ calculation */ +#define NON_BE_FIX_EVS_USAN_ERR_IN_WAVEADJUST /* FhG: address issue 1037 */ + /* #################### End BASOP porting switches ############################ */ #endif diff --git a/lib_dec/waveadjust_fec_dec_fx.c b/lib_dec/waveadjust_fec_dec_fx.c index 75a514cc21c2fb99f546ae3ff75358544c97b3bc..e0c599e235c098b8275f8bd8bcda333a9c2bb884 100644 --- a/lib_dec/waveadjust_fec_dec_fx.c +++ b/lib_dec/waveadjust_fec_dec_fx.c @@ -930,7 +930,20 @@ void concealment_decode_fix( /* sign randomization */ FOR( i = 0; i < N; i++ ) { +#ifdef NON_BE_FIX_EVS_USAN_ERR_IN_WAVEADJUST + Word16 rnd; + rnd = own_random_fix( seed ); + IF( GE_16( rnd, 0 ) ) + { + sign = 1; + } + ELSE IF( LT_16( rnd, 0 ) ) + { + sign = -1; + } +#else sign = add( shl( shr( own_random_fix( seed ), 15 ), 1 ), 1 ); +#endif if ( EQ_16( sign, -1 ) ) { invkoef[i] = L_negate( invkoef[i] );