Commit d3d6d74e authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch... 

Merge branch '1058-parammc-binaural_room_reverb-causes-premature-end-of-decoding-due-to-error-in-efap' into 'main'

Resolve "ParamMC + BINAURAL_ROOM_REVERB causes premature end of decoding due to error in EFAP initialization"

See merge request !1496
parents 4e63c604 4e41443e

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ 
/* all switches in this category should start with "NONBE_" */



#define NON_BE_1055_RESET_LP_MEMORIES                   /* VA: issue 1055: Correctly reset LP filter MA and AR memories in bitrate switching */

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





/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_binRenderer_internal.c

+17 −5
Original line number Diff line number Diff line
@@ -1261,6 +1261,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++ )
@@ -1269,16 +1273,24 @@ ivas_error ivas_binRenderer_open( 
                }

            }

        }

    }

    else

    {

        hBinRenderer->hReverb = NULL;

    }



    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

    {

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

#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++ )

            {