Commit 2b9eac58 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch... 

Merge branch '922-use-precomputed-HRTF-average-LR-energies-and-IAC-in-all-renderers-temp' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into 922-use-precomputed-HRTF-average-LR-energies-and-IAC-in-all-renderers-temp
parents 376fd163 3f0deb7c

lib_dec/ivas_init_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1105,7 +1105,7 @@ ivas_error ivas_init_decoder_front( 
        }



#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

        if ( ( error = ivas_HRTF_statistics_binary_open( &st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

        if ( ( error = ivas_HRTF_statistics_binary_open( &st_ivas->hHrtfStatistics ) ) != IVAS_ERR_OK )

        {

            return error;

        }

lib_rend/ivas_hrtf.c

+1 −2
Original line number Diff line number Diff line
@@ -247,8 +247,7 @@ void ivas_HRTF_parambin_binary_close( 
 *-----------------------------------------------------------------------*/



ivas_error ivas_HRTF_statistics_binary_open(

    HRTFS_STATISTICS **hHrtfStatistics,

    int32_t sampleRate )

    HRTFS_STATISTICS **hHrtfStatistics )

{

    *hHrtfStatistics = (HRTFS_STATISTICS *) malloc( sizeof( HRTFS_STATISTICS ) );

    if ( *hHrtfStatistics == NULL )

lib_rend/ivas_prot_rend.h

+1 −2
Original line number Diff line number Diff line
@@ -619,8 +619,7 @@ void ivas_HRTF_parambin_binary_close( 


#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

ivas_error ivas_HRTF_statistics_binary_open(

    HRTFS_STATISTICS **hHrtfStatistics,

    int32_t sampleRate

    HRTFS_STATISTICS **hHrtfStatistics

);



void ivas_HRTF_statistics_binary_close(

lib_rend/lib_rend.c

+1 −1
Original line number Diff line number Diff line
@@ -3474,7 +3474,7 @@ ivas_error IVAS_REND_Open( 
            return error;

        }

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

        if ( ( error = ivas_HRTF_statistics_binary_open( &( hIvasRend->hHrtfs.hHrtfStatistics ), outputSampleRate ) ) != IVAS_ERR_OK )

        if ( ( error = ivas_HRTF_statistics_binary_open( &( hIvasRend->hHrtfs.hHrtfStatistics ) ) ) != IVAS_ERR_OK )

        {

            return error;

        }