Commit b88bfa5a authored by vaclav's avatar vaclav
Browse files

fix + activate FIX_1227_Crend_HRTF_LOADING_OPTIM2

parent bead5492

apps/decoder.c

+0 −2
Original line number Diff line number Diff line
@@ -3711,13 +3711,11 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile( 
            destroy_td_hrtf( hHrtfBinary->hHrtfTD );

        }



#ifndef FIX_1227_Crend_HRTF_LOADING_OPTIM

        if ( !( binaural_renderer == IVAS_BIN_RENDERER_TYPE_CREND || binaural_renderer == IVAS_BIN_RENDERER_TYPE_DEFAULT ) && hHrtfBinary->hSetOfHRTF != NULL )

        {

            destroy_SetOfHRTF( hHrtfBinary->hSetOfHRTF );

        }



#endif

        if ( ( error = IVAS_DEC_HRTF_binary_close( hIvasDec, hHrtfBinary->binaural_renderer_old ) ) != IVAS_ERR_OK )

        {

            return error;

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

#define FIX_1227_Crend_HRTF_LOADING_OPTIM               /* VA: issue 1227: for Crend binaural renderer in decoder, load only HTRT coefficient set that is needed */

//#define FIX_1227_Crend_HRTF_LOADING_OPTIM2

#define FIX_1227_Crend_HRTF_LOADING_OPTIM2



/* #################### End BE switches ################################## */

lib_rend/ivas_crend.c

+2 −0
Original line number Diff line number Diff line
@@ -761,7 +761,9 @@ static ivas_error ivas_rend_initCrend( 
    }

    else

    {

#ifndef FIX_1227_Crend_HRTF_LOADING_OPTIM

        hHrtf->init_from_rom = 0;

#endif

        if ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED )

        {

            hHrtf->max_num_ir -= 1; /* subtract LFE */