Commit 5972205a authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into 1924-basop-PortDFlpMr1899

parents c442063e d5d268e9

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ 
#define FIX_1843_IO_QFACTOR_INIT                             /* FhG: initialize CRend's io_qfactor also in IVAS_rend */





#define FIX_1931_BIN_COHR_CROSS_MIX                    /* FhG: correct binauralCoherenceCrossmixGains_fx calculation */

/* #################### Start BASOP porting switches ############################ */



#define FIX_1372_ISAR_POST_REND

lib_rend/ivas_reverb_fx.c

+14 −6
Original line number Diff line number Diff line
@@ -236,6 +236,11 @@ static void ivas_binaural_reverb_setReverbTimes_fx( 
        L_tmp = Mpy_32_16_1( output_Fs, tmp ); /*- exp */

        binCenterFreq_exp = add( 31, exp );

        binCenterFreq_fx = L_shr( L_tmp, 1 ); // divide by 2

#ifdef FIX_1931_BIN_COHR_CROSS_MIX

        norm = norm_l( binCenterFreq_fx );

        binCenterFreq_fx = L_shl( binCenterFreq_fx, norm );

        binCenterFreq_exp = sub( binCenterFreq_exp, norm );

#endif

        IF( bin == 0 )

        {

            diffuseFieldICC_fx = ONE_IN_Q31;
@@ -259,9 +264,12 @@ static void ivas_binaural_reverb_setReverbTimes_fx( 


            /* binCenterFreq / 2700.0f */

            L_tmp = Mpy_32_32( binCenterFreq_fx, 795364 /* 1 / 2700 in Q31 */ );

#ifdef FIX_1931_BIN_COHR_CROSS_MIX

            L_tmp = L_shl( L_tmp, binCenterFreq_exp ); /* Q31 */

#else

            norm = norm_l( L_tmp );

            L_tmp = L_shl( L_tmp, norm ); /* Q31 */



#endif

            /* ( 1.0f - binCenterFreq / 2700.0f ) */

            L_tmp = L_sub( ONE_IN_Q31, L_tmp ); /* Q31 */