Commit e35bb52e authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM

parent 5e5c5e2f

lib_com/options.h

+0 −3
Original line number Diff line number Diff line
@@ -177,9 +177,6 @@ 


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



#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */

#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM

#endif



#define USE_NEW_HRTF_BINARY_FILE_FORMAT                 /* Orange: to activate when decided to change the hrtf binary file format */

#define FIX_WARNING_RENDER_CONFIG                       /* Orange: fix warning on windows build */

lib_dec/ivas_binRenderer_internal.c

+0 −10
Original line number Diff line number Diff line
@@ -1209,9 +1209,7 @@ ivas_error ivas_binRenderer_open( 
                }

            }

        }

#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM

        if ( hBinRenderer->nInChannels != HOA3_CHANNELS )

#endif

        {

            for ( chIdx = 0; chIdx < BINAURAL_CHANNELS; chIdx++ )

            {
@@ -1230,17 +1228,9 @@ ivas_error ivas_binRenderer_open( 


    hBinRenderer->hEFAPdata = NULL;



#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM

    if ( hBinRenderer->hReverb != NULL && hBinRenderer->nInChannels != HOA3_CHANNELS )

#else

    if ( hBinRenderer->hReverb != NULL )

#endif

    {

#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM

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

#else

        if ( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 && hBinRenderer->nInChannels != HOA3_CHANNELS )

#endif

        {

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

            {