Commit 472752df authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1835_REVERB_ACTIVATION

parent 16150f6d

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_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 */

#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */

lib_dec/ivas_binRenderer_internal_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -981,11 +981,7 @@ static void ivas_binaural_obtain_DMX_fx( 
                ELSE

                {

                    Word16 div = divide3232( P_in_fx[bandIdx], P_out_fx );

#ifdef FIX_1835_REVERB_ACTIVATION

                    Word16 exp = 0; // divide3232 returns Q15 + following Q16 shift

#else

                    Word16 exp = norm_l( div );

#endif

                    factEQ_fx = Sqrt32( L_shl( div, Q16 ), &exp );

                    factEQ_fx = L_shl( factEQ_fx, sub( exp, 1 ) ); // Q30

                }
@@ -1354,11 +1350,7 @@ ivas_error ivas_binRenderer_open_fx( 


    /* Allocate memories needed for reverb module */

    test();

#ifdef FIX_1835_REVERB_ACTIVATION

    IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) || ( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) && EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) )

#else

    IF( ( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) ) && EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#endif

        {

            IF( NE_32( ( error = ivas_binaural_reverb_init( &( hBinRenderer->hReverb ), st_ivas->hHrtfStatistics, hBinRenderer->conv_band, hBinRenderer->timeSlots, &( st_ivas->hRenderConfig->roomAcoustics ), st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv->fastconvReverberationTimes_fx, st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections_fx ) ), IVAS_ERR_OK ) ){

                return error;

lib_rend/ivas_rotation_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -1165,9 +1165,7 @@ void rotateFrame_sd_cldfb_fixed( 
        IF( hEFAPdata != NULL && ( NE_16( extract_l( L_shr( hOutputSetup->ls_azimuth_fx[n], Q22 ) ), azimuth ) || NE_16( extract_l( L_shr( hOutputSetup->ls_elevation_fx[n], Q22 ) ), elevation ) ) )

        {

            efap_determine_gains_fx( hEFAPdata, gains_fx[n], L_shl( azimuth, Q22 ), L_shl( elevation, Q22 ), EFAP_MODE_EFAP );

#ifdef FIX_1835_REVERB_ACTIVATION

            scale_sig32( gains_fx[n], hEFAPdata->numSpk, Q1 ); // gains_fx: Q31

#endif

        }

        ELSE

        {