Commit 29faf340 authored by Dominik Weckbecker's avatar Dominik Weckbecker
Browse files

Merge branch 'main' into FhG/SBA-to-stereo-improvements

parents 25872f96 8e34c2c3

apps/decoder.c

+7 −0
Original line number Diff line number Diff line
@@ -538,6 +538,13 @@ cleanup: 
        IVAS_DEC_HRTF_HANDLE hHrtfTD;

        IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD );

        dealloc_HRTF_binary( hHrtfTD );

#ifdef HRTF_BINARY_FILE

#ifdef FIX_MEMORY_COUNTING_HRTF_BINARY_FILE

        IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF;

        IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF );

        destroy_SetOfHRTF( hSetOfHRTF );

#endif

#endif

    }

    IVAS_DEC_Close( &hIvasDec );

    CustomLsReader_close( &hLsCustomReader );

lib_com/ivas_prot.h

+2 −0
Original line number Diff line number Diff line
@@ -5408,9 +5408,11 @@ ivas_error ivas_crend_init_from_hrtf_handle( 
	HRTFS_HANDLE hrtf);

#endif



#ifndef FIX_MEMORY_COUNTING_HRTF_BINARY_FILE

ivas_error destroy_SetOfHRTF(

	HRTFS_CREND_HANDLE hSetOfHRTF    /* i/o: Set of HRTF CRend handle              */

);

#endif



#endif

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -154,6 +154,9 @@ 
#define FIX_301_PLC                                     /* FhG: issue 301 - fix bug of missing update of overlap buffer for DFT-stereo PLC*/

#define FIX_337_TDREND_INTP                             /* Issue 337: TD renderer interpolation threshold set too low */



#ifdef HRTF_BINARY_FILE                                /* HRTF filters' binary file used for binaural rendering. */

#define FIX_MEMORY_COUNTING_HRTF_BINARY_FILE

#endif

#define FIX_310_TD_REND_DELAY                           /* Adding HRTF delay being read from ROM/Binary file, fix rounding for delay compensation in renderer */

#define FIX_334_DEBUG_BE_STEREO_SWITCHING               /* FhG: Fix non-BE issue for stereo switching when DEBUGGING is enabled */

lib_dec/ivas_init_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -1805,7 +1805,9 @@ void ivas_destroy_dec( 
    /* CRend binaural renderer handle */

    if ( st_ivas->hSetOfHRTF != NULL )

    {

#ifndef FIX_MEMORY_COUNTING_HRTF_BINARY_FILE

        destroy_SetOfHRTF( st_ivas->hSetOfHRTF );

#endif

        ivas_HRTF_CRend_binary_close( &st_ivas->hSetOfHRTF );

    }

lib_rend/ivas_crend.c

+2 −1
Original line number Diff line number Diff line
@@ -875,6 +875,7 @@ ivas_error ivas_crend_init_from_setofhrtf( 
#endif

#endif



#ifndef FIX_MEMORY_COUNTING_HRTF_BINARY_FILE

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

 * destroy_HRTF()

 *
@@ -952,7 +953,7 @@ ivas_error destroy_SetOfHRTF( 
}



#endif



#endif

#ifndef FIX_197_CREND_INTERFACE

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

 * ivas_crend_open()