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

Merge branch '1631_basop-port-mr-1498-from-float' into 'main' 

Port MR 1498 from float to BASOP

Closes #1631

See merge request !1663
parents 2cf52e95 51c0a512

lib_com/options.h

+2 −4
Original line number Diff line number Diff line
@@ -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

lib_dec/waveadjust_fec_dec_fx.c

+13 −0
Original line number Diff line number Diff line
@@ -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] );