Commit a9834331 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING

parent 47d2dc63

lib_com/options.h

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


//#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */

/* #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 NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING       /* FhG: issue 987: solution b: downmix HOA3 to stereo a input for the reverberator */

#define NONBE_FIX_1006_PAST_DMX_NRG_ERROR               /* Eri/FhG: Issue 1006: Bug fix in ivas_stereo_dft_dec not replicated in ivas_stereo_dft_dec_dmx */

lib_dec/ivas_binRenderer_internal_fx.c

+0 −6
Original line number Diff line number Diff line
@@ -1015,7 +1015,6 @@ static void ivas_binaural_obtain_DMX_fx( 
            set32_fx( outRealRightPtr_fx, 0, CLDFB_NO_CHANNELS_MAX );

            set32_fx( outImagRightPtr_fx, 0, CLDFB_NO_CHANNELS_MAX );



#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING

            /*Ambisonics input requires different processing*/

            if ( EQ_16( hBinRenderer->nInChannels, HOA3_CHANNELS ) )

            {
@@ -1038,7 +1037,6 @@ static void ivas_binaural_obtain_DMX_fx( 
                }

            }

            else

#endif

            {

                FOR( chIdx = 0; chIdx < hBinRenderer->nInChannels; chIdx++ )

                {
@@ -1397,11 +1395,7 @@ ivas_error ivas_binRenderer_open_fx( 
#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM

        IF( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 )

#else

#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING

        IF( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 && NE_16( hBinRenderer->nInChannels, HOA3_CHANNELS ) )

#else

        IF( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 )

#endif

#endif

        {

            FOR( k = 0; k < 11; k++ )