Commit c6f8fd55 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM

parent 40c020c4

lib_com/options.h

+0 −3
Original line number Diff line number Diff line
@@ -92,9 +92,6 @@ 
/* #################### Start BASOP porting switches ############################ */



#define FIX_1372_ISAR_POST_REND

#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 NONBE_FIX_984_OMASA_EXT_OUTPUT                        /* Nokia: issue #984: complete the OMASA EXT output implementation */

lib_dec/ivas_binRenderer_internal_fx.c

+0 −19
Original line number Diff line number Diff line
@@ -1443,7 +1443,6 @@ ivas_error ivas_binRenderer_open_fx( 
        }



        /* initialize the dmx matrix */

#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM

#ifndef FIX_1053_REVERB_RECONFIGURATION

        IF( NE_16( hBinRenderer->nInChannels, HOA3_CHANNELS ) )

        {
@@ -1456,16 +1455,6 @@ ivas_error ivas_binRenderer_open_fx( 
                }

            }

        }

#endif

#else

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

        {

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

            {

                hBinRenderer->hReverb->dmxmtx_fx[chIdx][k] = dmxmtx_table_fx[chIdx][k];

                move32();

            }

        }

#endif

    }

    ELSE
@@ -1475,19 +1464,11 @@ ivas_error ivas_binRenderer_open_fx( 


    hBinRenderer->hEFAPdata = NULL;



#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM

    IF( hBinRenderer->hReverb != NULL && NE_16( hBinRenderer->nInChannels, HOA3_CHANNELS ) )

#else

    IF( hBinRenderer->hReverb != NULL )

#endif

    {

        test();

        test();

#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM

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

#else

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

#endif

        {

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

            {