Commit dd3eacaf authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch '1631_ref_port-mr-1498-from-float' into 'ivas-float-update' 

Port MR 1498 from float to float-pc

See merge request !1662
parents 8340b856 9d85b91d

lib_com/options.h

+1 −2
Original line number Diff line number Diff line
@@ -180,11 +180,10 @@ 
#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */

#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM

#endif



#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 actiate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on  )*/

#define NON_BE_FIX_EVS_USAN_ERR_IN_WAVEADJUST           /* FhG: address issue 1037 */



#define NONBE_FIX_984_OMASA_EXT_OUTPUT                  /* Nok: issue 1497 - porting OMASA EXT MR   */

/* #################### End BASOP porting switches ############################ */

lib_dec/waveadjust_fec_dec.c

+7 −0
Original line number Diff line number Diff line
@@ -742,7 +742,14 @@ void concealment_decode( 
            /* sign randomization */

            for ( i = 0; i < hPlcInfo->L_frameTCX; i++ )

            {



#ifdef NON_BE_FIX_EVS_USAN_ERR_IN_WAVEADJUST

                int16_t rnd;

                rnd = own_random( seed );

                sign = ( rnd >= 0 ) - ( rnd < 0 );

#else

                sign = ( ( own_random( seed ) >> 15 ) << 1 ) + 1;

#endif

                invkoef[i] *= sign;

            }

        }