Commit 27bf2432 authored by norvell's avatar norvell
Browse files

Added fix FIX_462_HRTF_FILE_BR_SWITCH_MEM_ERR to do proper deallocation of... 

Added fix FIX_462_HRTF_FILE_BR_SWITCH_MEM_ERR to do proper deallocation of structures allocated by HRTF file reading
parent 33ba50d9

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ 
#define FIX_DIRAC_LS_SYNTHESIS_CONFIG_479               /* FhG: fix for issue 479, broken LS output with DirAC at high BRs */



#define HYBRID_ITD_MAX                                 /* FhG: Improvement for DFT-stereo for cases with large ITDs */



#define FIX_462_HRTF_FILE_BR_SWITCH_MEM_ERR             /* Eri: Fix for issue 462: Use-of-uninitialized memory in external HRTF deallocation in decoder together with BR switching */



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_dec/ivas_ism_dec.c

+6 −1
Original line number Diff line number Diff line
@@ -41,7 +41,9 @@ 
#include "debug.h"

#endif

#include "wmc_auto.h"



#ifdef FIX_462_HRTF_FILE_BR_SWITCH_MEM_ERR

#include "hrtf_file_reader.h"

#endif



/*-------------------------------------------------------------------------*

 * ivas_ism_bitrate_switching()
@@ -260,6 +262,9 @@ static ivas_error ivas_ism_bitrate_switching( 
            }



            /* Close the TD Binaural renderer */

#ifdef FIX_462_HRTF_FILE_BR_SWITCH_MEM_ERR

            dealloc_HRTF_binary( st_ivas->hBinRendererTd->HrFiltSet_p );

#endif

            if ( st_ivas->hBinRendererTd != NULL )

            {

                ivas_td_binaural_close( &st_ivas->hBinRendererTd );