Commit 521996d6 authored by vaclav's avatar vaclav
Browse files

accept NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM

parent 6d7ee423

lib_com/options.h

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

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





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

#define NONBE_FIX_1056_ISM_RATE_SWITCH                  /* FhG: Fix #1056: fix TC buffer udpate on a ISM rate switch */	

#define NON_BE_FIX_1048_THRESHOLD_COH_BASOP             /* Nokia: Fix 1048 replace comparison with 0 with comparison to threshold, to align with BASOP*/

#define NONBE_FIX_1054_NEGATIVE_LVQ_INDEX               /* Nokia: issue 1054: Input to decode_comb in deindex_lvq_SHB should be positive */

lib_dec/ivas_binRenderer_internal.c

+1 −10
Original line number Diff line number Diff line
@@ -1261,9 +1261,7 @@ 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++ )

            {
@@ -1280,17 +1278,10 @@ 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++ )

            {