Commit dc9b6c1e authored by Jan Kiene's avatar Jan Kiene
Browse files

port float MR 1496 out of line to fix tests

parent c4a562c0

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ 
#define NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA           /* FhG: issue 926: crash in OSBA decoding with planar FOA */

#define FIX_929_RENDERER_CMDL                           /* Nokia: issue #929: renderer command line option */

#define NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR               /* FhG: re-enable acidentially disabled reverberator for BINAURAL_ROOM_IR */

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



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_binRenderer_internal.c

+21 −8
Original line number Diff line number Diff line
@@ -1237,6 +1237,10 @@ ivas_error ivas_binRenderer_open( 
        }



        /* initialize the dmx matrix */

#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM

        if ( hBinRenderer->nInChannels != HOA3_CHANNELS )

#endif

        {

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

            {

                for ( k = 0; k < hBinRenderer->nInChannels; k++ )
@@ -1245,6 +1249,7 @@ ivas_error ivas_binRenderer_open( 
                }

            }

        }

    }

    else

    {

        hBinRenderer->hReverb = NULL;
@@ -1252,9 +1257,17 @@ 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++ )

            {