Commit a7b4b50e authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING

parent d94a298c

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



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

#define NONBE_FIX_1010_STEREO_CNG_DIV_BY_ZERO                 /* Eri: Issue 1010: Division by zero in Stereo CNG */

lib_dec/ivas_binRenderer_internal.c

+0 −6
Original line number Diff line number Diff line
@@ -952,7 +952,6 @@ static void ivas_binaural_obtain_DMX( 
            set_zero( outRealRightPtr, CLDFB_NO_CHANNELS_MAX );

            set_zero( outImagRightPtr, CLDFB_NO_CHANNELS_MAX );



#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING

            /*Ambisonics input requires different processing*/

            if ( hBinRenderer->nInChannels == 16 )

            {
@@ -975,7 +974,6 @@ static void ivas_binaural_obtain_DMX( 
                }

            }

            else

#endif

            {

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

                {
@@ -1280,11 +1278,7 @@ ivas_error ivas_binRenderer_open( 


    if ( hBinRenderer->hReverb != NULL )

    {

#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING

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

#else

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

#endif

        {

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

            {