Commit 6e0441eb authored by emerit's avatar emerit
Browse files

renaming load_reverb_binary to load_HrtfStatistics_from_binary

parent 8679c8fb

apps/decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -4302,7 +4302,7 @@ static ivas_error load_hrtf_from_file( 
        }



#ifdef FIX_2249_MEMORY_LEAK_IN_SBA

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

        if ( ( error = load_HrtfStatistics_from_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

apps/renderer.c

+4 −0
Original line number Diff line number Diff line
@@ -1064,7 +1064,11 @@ int main( 
                fprintf( stderr, "\nIVAS_REND_GetHrtfStatisticsHandle failed\n\n" );

                goto cleanup;

            }

#ifdef FIX_2249_MEMORY_LEAK_IN_SBA

            if ( ( error = load_HrtfStatistics_from_binary( *hHrtfStatistics, args.sampleRate, hrtfFileReader ) ) != IVAS_ERR_OK )

#else

            if ( ( error = load_reverb_binary( *hHrtfStatistics, args.sampleRate, hrtfFileReader ) ) != IVAS_ERR_OK )

#endif

            {

                if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

                {

lib_rend/ivas_prot_rend.h

+1 −1
Original line number Diff line number Diff line
@@ -1021,8 +1021,8 @@ ivas_error ivas_reverb_HRTF_statistics_open( 
    HRTFS_STATISTICS_HANDLE *hHrtfStatistics,                   /* o  : HRTF statistics handle                  */

    const int32_t output_Fs                                     /* i  : output sampling rate                    */

);



#endif



ivas_error ivas_reverb_open( 

    REVERB_HANDLE *hReverb,                                     /* i/o: Reverberator handle                     */

    const HRTFS_STATISTICS_HANDLE hHrtfStatistics,              /* i  : HRTF statistics handle                  */

lib_rend/ivas_stat_rend.h

+1 −1
Original line number Diff line number Diff line
@@ -1032,10 +1032,10 @@ typedef struct 
typedef struct ivas_hrtf_TDREND_HRFILT_FiltSet_struct

{

    int32_t SampleRate; /* Sample rate of the HR filter */

#ifndef FIX_2249_MEMORY_LEAK_IN_SBA

    int16_t NumPos;

    int16_t NumElev;

    float Dist;

#ifndef FIX_2249_MEMORY_LEAK_IN_SBA

    float *ItdSet_p;

#endif

    int16_t FiltLength;

lib_util/hrtf_file_reader.c

+13 −2
Original line number Diff line number Diff line
@@ -969,18 +969,29 @@ static ivas_error load_reverb_from_binary( 
    return IVAS_ERR_OK;

}





#ifdef FIX_2249_MEMORY_LEAK_IN_SBA

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

 * load_HrtfStatistics_from_binary()

 *

 * Load HRTF binary data into the HRTF handle for TD and Crend renderers

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

ivas_error load_HrtfStatistics_from_binary(

    IVAS_DEC_HRTF_STATISTICS_HANDLE hHrtfStatistics, /* i/o: HRTF statistics handle              */

    const int32_t sampleRate,                        /* i  : sample rate                         */

    const hrtfFileReader *hrtfReader                 /* i/o: pointer to hrtfFileReader handle    */

)

#else

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

 * load_reverb_binary()

 *

 * Load HRTF binary data into the HRTF handle for TD and Crend renderers

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



ivas_error load_reverb_binary(

    IVAS_DEC_HRTF_STATISTICS_HANDLE hHrtfStatistics, /* i/o: HRTF statistics handle              */

    const int32_t sampleRate,                        /* i  : sample rate                         */

    const hrtfFileReader *hrtfReader                 /* i/o: pointer to hrtfFileReader handle    */

)

#endif

{

    if ( hrtfReader == NULL || hrtfReader->file == NULL || hHrtfStatistics == NULL )

    {