Commit 0df3b3bb authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Cleanup

parent 35e4df9f

apps/renderer.c

+0 −7
Original line number Diff line number Diff line
@@ -1059,13 +1059,6 @@ int main( 
        exit( -1 );

    }



#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

    if ( ( error = IVAS_REND_InitHRTFStatisticsHandle( hIvasRend ) ) != IVAS_ERR_OK )

    {

        return error;

    }

#endif



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    if ( !isEmptyString( args.customHrtfFilePath ) )

    {

lib_dec/ivas_init_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1998,7 +1998,7 @@ ivas_error ivas_init_decoder( 
#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

    if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

    {

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

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

        {

            return error;

        }

lib_rend/ivas_hrtf.c

+3 −3
Original line number Diff line number Diff line
@@ -280,12 +280,12 @@ void ivas_HRTF_statistics_binary_close( 
}



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

 * ivas_hrtf_statistics_open()

 * ivas_HRTF_statistics_init()

 *

 * Allocate HRTF handle for statistics handler

 * Allocates HRTF statistics handle and initializes from ROM 

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



ivas_error ivas_hrtf_statistics_open(

ivas_error ivas_HRTF_statistics_init(

    HRTFS_STATISTICS_HANDLE *hHrtfStatistics,

    int32_t sampleRate )

{

lib_rend/ivas_prot_rend.h

+1 −1
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ void ivas_HRTF_statistics_binary_close( 
    HRTFS_STATISTICS **hHrtfStatistics                          /* i/o: HRTF statistics structure               */

);



ivas_error ivas_hrtf_statistics_open(

ivas_error ivas_HRTF_statistics_init(

    HRTFS_STATISTICS_HANDLE *hHrtfStatistics,                   /* i/o: HRTF statistics structure               */

    int32_t sampleRate );                                       /* i  : Sample rate                             */

#endif

lib_rend/lib_rend.c

+6 −17
Original line number Diff line number Diff line
@@ -3480,6 +3480,12 @@ ivas_error IVAS_REND_Open( 
        }

#endif

    }

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

    if ( ( error = ivas_HRTF_statistics_init( &( hIvasRend->hHrtfs.hHrtfStatistics ), hIvasRend->sampleRateOut ) ) != IVAS_ERR_OK )

    {

        return error;

    }

#endif

#endif



    return IVAS_ERR_OK;
@@ -8985,23 +8991,6 @@ ivas_error IVAS_REND_GetHrtfStatisticsHandle( 


    return IVAS_ERR_OK;

}



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

 * IVAS_REND_InitHRTFStatisticsHandle( )

 *

 *

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

ivas_error IVAS_REND_InitHRTFStatisticsHandle( IVAS_REND_HANDLE hIvasRend )

{

    ivas_error error;



    if ( ( error = ivas_hrtf_statistics_open( &( hIvasRend->hHrtfs.hHrtfStatistics ), hIvasRend->sampleRateOut ) ) != IVAS_ERR_OK )

    {

        return error;

    }



    return IVAS_ERR_OK;

}

#endif



static ivas_error ivas_masa_ext_rend_dirac_rend_init(