Commit 034573a8 authored by emerit's avatar emerit
Browse files

bug fix and fix IVAS_DEC_HRTF_BINARY_WRAPPER

parent ba0d3b42

apps/decoder.c

+39 −2
Original line number Diff line number Diff line
@@ -159,9 +159,11 @@ typedef struct 
    hrtfFileReader *hrtfReader;

    char *hrtfFileName;



#ifndef FIX_2249_MEMORY_LEAK_IN_SBA

    IVAS_DEC_HRTF_TD_HANDLE *hHrtfTD;



    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics;

#endif



    IVAS_BIN_RENDERER_TYPE binaural_renderer;

    IVAS_BIN_RENDERER_TYPE binaural_renderer_old;
@@ -242,8 +244,10 @@ int main( 
    enable_float_exception_trap( FLE_MASK_DENORM | FLE_MASK_UNDERFLOW );

#endif



#ifndef FIX_2249_MEMORY_LEAK_IN_SBA

    hHrtfBinary.hHrtfTD = NULL;         /* just to avoid compilation warning */

    hHrtfBinary.hHrtfStatistics = NULL; /* just to avoid compilation warning */

#endif



    splitRendBits.bits_buf = splitRendBitsBuf;
@@ -849,11 +853,13 @@ cleanup: 
    IVAS_DEC_GetSbaDebugParams( hIvasDec, &numOutChannels, &numTransportChannels, &pca_ingest_channels );



#endif

#ifndef FIX_2249_MEMORY_LEAK_IN_SBA

    if ( arg.hrtfReaderEnabled )

    {

        destroy_td_hrtf( hHrtfBinary.hHrtfTD );

        destroy_hrtf_statistics( hHrtfBinary.hHrtfStatistics );

    }

#endif



    IVAS_DEC_Close( &hIvasDec );

    CustomLsReader_close( &hLsCustomReader );
@@ -4146,12 +4152,12 @@ static ivas_error load_hrtf_from_file( 
        /*------------------------------------------------------------------------------------------*

         * Release HRTF binary data

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



#ifndef FIX_2249_MEMORY_LEAK_IN_SBA

        if ( !( binaural_renderer == IVAS_BIN_RENDERER_TYPE_TDREND || binaural_renderer == IVAS_BIN_RENDERER_TYPE_DEFAULT ) && binaural_renderer_sec != IVAS_BIN_RENDERER_TYPE_TDREND && hHrtfBinary->hHrtfTD != NULL )

        {

            destroy_td_hrtf( hHrtfBinary->hHrtfTD );

        }



#endif

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

        {

            return error;
@@ -4173,13 +4179,23 @@ static ivas_error load_hrtf_from_file( 


        if ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_TDREND || binaural_renderer_sec == IVAS_BIN_RENDERER_TYPE_TDREND || binaural_renderer == IVAS_BIN_RENDERER_TYPE_DEFAULT )

        {



#ifdef FIX_2249_MEMORY_LEAK_IN_SBA

            IVAS_DEC_HRTF_TD_HANDLE *hHrtfTD = NULL;

            if ( ( error = IVAS_DEC_GetHrtfTDrendHandle( hIvasDec, &hHrtfTD ) ) != IVAS_ERR_OK )

#else

            if ( ( error = IVAS_DEC_GetHrtfTDrendHandle( hIvasDec, &hHrtfBinary->hHrtfTD ) ) != IVAS_ERR_OK )

#endif

            {

                fprintf( stderr, "\nIVAS_DEC_GetHrtfTDrendHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

                return error;

            }



#ifdef FIX_2249_MEMORY_LEAK_IN_SBA

            if ( ( error = load_TDrend_HRTF_binary( *hHrtfTD, output_Fs, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )

#else

            if ( ( error = load_TDrend_HRTF_binary( *hHrtfBinary->hHrtfTD, output_Fs, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )

#endif

            {

                if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

                {
@@ -4188,7 +4204,11 @@ static ivas_error load_hrtf_from_file( 
                }

                else

                {

#ifdef FIX_2249_MEMORY_LEAK_IN_SBA

                    destroy_td_hrtf( hHrtfTD );

#else

                    destroy_td_hrtf( hHrtfBinary->hHrtfTD );

#endif

                }

            }

        }
@@ -4263,15 +4283,28 @@ static ivas_error load_hrtf_from_file( 
        }

    }



#ifdef FIX_2249_MEMORY_LEAK_IN_SBA

    if ( ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_FASTCONV || binaural_renderer == IVAS_BIN_RENDERER_TYPE_CREND ) && OutputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

    if ( hHrtfBinary->hHrtfStatistics == NULL && ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_FASTCONV || binaural_renderer == IVAS_BIN_RENDERER_TYPE_CREND ) && OutputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif

    {

#ifdef FIX_2249_MEMORY_LEAK_IN_SBA

        IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;

        if ( ( error = IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics ) ) != IVAS_ERR_OK )

#else

        if ( ( error = IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfBinary->hHrtfStatistics ) ) != IVAS_ERR_OK )

#endif

        {

            fprintf( stderr, "\nIVAS_DEC_GetHrtfStatisticsHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            return error;

        }



#ifdef FIX_2249_MEMORY_LEAK_IN_SBA

        if ( ( error = load_reverb_binary( *hHrtfStatistics, output_Fs, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )

#else

        if ( ( error = load_reverb_binary( *hHrtfBinary->hHrtfStatistics, output_Fs, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )

#endif

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

            {
@@ -4280,7 +4313,11 @@ static ivas_error load_hrtf_from_file( 
            }

            else

            {

#ifdef FIX_2249_MEMORY_LEAK_IN_SBA

                destroy_hrtf_statistics( hHrtfStatistics );

#else

                destroy_hrtf_statistics( hHrtfBinary->hHrtfStatistics );

#endif

            }

        }

    }

lib_rend/ivas_hrtf.c

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ ivas_error ivas_HRTF_statistics_init( 
#endif

{

#ifdef FIX_2249_MEMORY_LEAK_IN_SBA

    if ( hHrtfStatistics == NULL || *hHrtfStatistics != NULL )

    if ( hHrtfStatistics == NULL || *hHrtfStatistics == NULL )

    {

        /* Tables not initialised */

        return IVAS_ERR_UNEXPECTED_NULL_POINTER;