Commit 17a5c173 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1931_BIN_COHR_CROSS_MIX

parent dd504220

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ 






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

#define FIX_1939_REVERB_DMX_OUT_Q                       /*Dlb: output correct q factor for the reverb dmx function*/



#define EVS_BE_REUSAGE

lib_rend/ivas_reverb_fx.c

+0 −7
Original line number Diff line number Diff line
@@ -247,11 +247,9 @@ 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;
@@ -275,12 +273,7 @@ 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 */