Commit b095efa6 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_MEMORY_COUNTING_HRTF_BINARY_FILE

parent e85bfd02

apps/decoder.c

+0 −2
Original line number Diff line number Diff line
@@ -535,11 +535,9 @@ cleanup: 
        IVAS_DEC_HRTF_HANDLE hHrtfTD;

        IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD );

        dealloc_HRTF_binary( hHrtfTD );

#ifdef FIX_MEMORY_COUNTING_HRTF_BINARY_FILE

        IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF;

        IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF );

        destroy_SetOfHRTF( hSetOfHRTF );

#endif

    }

    IVAS_DEC_Close( &hIvasDec );

    CustomLsReader_close( &hLsCustomReader );

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ 


#define FIX_329_ENABLE_TD_RENDERER_REVERB_MC            /* Eri: Enable reverb for TD renderer for 5.1 and 7.1 with headtracking enabled for IVAS_dec */



#define FIX_MEMORY_COUNTING_HRTF_BINARY_FILE

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

#define FIX_198_TDREND_INTERFACE                        /* Issue 198: Harmonize interface for TD renderer between decoder and external renderer */

lib_dec/ivas_init_dec.c

+0 −3
Original line number Diff line number Diff line
@@ -1806,9 +1806,6 @@ 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

+0 −9
Original line number Diff line number Diff line
@@ -866,15 +866,6 @@ ivas_error ivas_crend_init_from_setofhrtf( 


#endif



#ifndef FIX_MEMORY_COUNTING_HRTF_BINARY_FILE

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

 * destroy_HRTF()

 *

 * Destroy the HRTF CRend handle

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





#endif

#ifndef FIX_197_CREND_INTERFACE

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

 * ivas_crend_open()

lib_rend/ivas_hrtf.c

+0 −3
Original line number Diff line number Diff line
@@ -116,9 +116,6 @@ void ivas_HRTF_CRend_binary_close( 
        return;

    }



#ifndef FIX_MEMORY_COUNTING_HRTF_BINARY_FILE

    destroy_SetOfHRTF( *hSetOfHRTF );

#endif



    free( *hSetOfHRTF );

    *hSetOfHRTF = NULL;