Commit 16150f6d authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1831_REVERB_REGRESSION

parent bffc4d37

lib_com/options.h

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


#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT   /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/



#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 LC3PLUS_LEA_COMPAT_BITRATES_48_6                /* FhG: treat split-rendering 256kbps lc3plus 10ms 0dof bitrate as sentinel value for LEA compatible 48_6 bitrate (124 kbps per channel)  */

#define NONBE_FIX_ISM_XOVER_BR                          /* FhG: issue 1072: select OSBA coding method depending on number of object and bitrate */

lib_rend/ivas_reverb_fx.c

+0 −6
Original line number Diff line number Diff line
@@ -2518,9 +2518,7 @@ ivas_error ivas_binaural_reverb_init( 
    Word32 t60[CLDFB_NO_CHANNELS_MAX];

    Word32 ene[CLDFB_NO_CHANNELS_MAX];

    Word16 preDelay;

#ifdef FIX_1831_REVERB_REGRESSION

    Word32 temp32;

#endif



    error = IVAS_ERR_OK;
@@ -2537,12 +2535,8 @@ ivas_error ivas_binaural_reverb_init( 
            return error;

        }



#ifdef FIX_1831_REVERB_REGRESSION

        temp32 = Mult_32_16( roomAcoustics->acousticPreDelay_fx, ( ( IVAS_48k / CLDFB_NO_CHANNELS_MAX ) >> 1 ) ); // Q11

        preDelay = extract_l( L_shr( L_add( temp32, L_shl( 1, 10 ) ), 11 ) );                                     // Q0

#else

        preDelay = (int16_t) roundf( 48000.0f * roomAcoustics->acousticPreDelay / CLDFB_NO_CHANNELS_MAX );

#endif

        floatToFixed_arrL( t60_temp, t60, Q26, CLDFB_NO_CHANNELS_MAX );

        floatToFixed_arrL( ene_temp, ene, Q31, CLDFB_NO_CHANNELS_MAX );

    }