Commit 33e2a7f1 authored by vaclav's avatar vaclav
Browse files

- Merge branch 'orange/fixpoint_crend_hrtf_file_format_clean_up' of... 

- Merge branch 'orange/fixpoint_crend_hrtf_file_format_clean_up' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into orange/fixpoint_crend_hrtf_file_format_clean_up
parents e484cf5c 1929b15b

lib_com/ivas_prot.h

+4 −1
Original line number Diff line number Diff line
@@ -5130,8 +5130,11 @@ ivas_error ivas_allocate_binaural_hrtf( 
    HRTFS_FASTCONV *HrtfFastConv,                               /* i/o: FASTCONV HRTF structure */

    const AUDIO_CONFIG input_config,                            /* i  : input audio configuration                       */

    const BINAURAL_INPUT_AUDIO_CONFIG bin_input_config,         /* i  : binaural input audio config                     */

    const RENDERER_TYPE renderer_type,                          /* i  : renderer type                                   */

    const RENDERER_TYPE renderer_type                           /* i  : renderer type                                   */

#ifndef FIX_1123_FASTCONV_16BIT_ROM

    ,

    const int16_t allocate_init_flag                            /* i  : Memory allocation flag                          */

#endif

);



#ifdef DEBUGGING

lib_dec/ivas_binRenderer_internal.c

+82 −28
Original line number Diff line number Diff line
@@ -491,8 +491,9 @@ void ivas_init_binaural_hrtf( 
    HrtfFastConv->rightHRIRImag_FOA = NULL;

    HrtfFastConv->FASTCONV_FOA_latency_s = 0x00;



#ifndef FIX_1123_FASTCONV_16BIT_ROM

    HrtfFastConv->allocate_init_flag = 0x00;

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#else

    HrtfFastConv->ntaps_hrir = BINAURAL_NTAPS;

    HrtfFastConv->ntaps_hrir_foa = BINAURAL_NTAPS_SBA;

    HrtfFastConv->ntaps_hrir_hoa2 = BINAURAL_NTAPS_SBA;
@@ -520,8 +521,12 @@ static ivas_error ivas_alloc_pppMem( 
    float ****pppMem,

    const int16_t dim1,

    const int16_t dim2,

    const int16_t dim3,

    const int16_t allocate_init_flag )

    const int16_t dim3

#ifndef FIX_1123_FASTCONV_16BIT_ROM

    ,

    const int16_t allocate_init_flag

#endif

)

{

    int16_t i, j;

    float ***localMem = NULL;
@@ -537,8 +542,10 @@ static ivas_error ivas_alloc_pppMem( 
        {

            return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HRTF memory" );

        }

#ifndef FIX_1123_FASTCONV_16BIT_ROM

        if ( allocate_init_flag == 0 )

        {

#endif

            for ( j = 0; j < dim2; j++ )

            {

                if ( ( localMem[i][j] = (float *) malloc( dim3 * sizeof( float ) ) ) == NULL )
@@ -546,7 +553,9 @@ static ivas_error ivas_alloc_pppMem( 
                    return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HRTF memory" );

                }

            }

#ifndef FIX_1123_FASTCONV_16BIT_ROM

        }

#endif

    }



    *pppMem = localMem;
@@ -565,8 +574,11 @@ ivas_error ivas_allocate_binaural_hrtf( 
    HRTFS_FASTCONV *HrtfFastConv,                       /* i/o: FASTCONV HRTF structure     */

    const AUDIO_CONFIG input_config,                    /* i  : input audio configuration   */

    const BINAURAL_INPUT_AUDIO_CONFIG bin_input_config, /* i  : binaural input audio config */

    const RENDERER_TYPE renderer_type,                  /* i  : renderer type               */

    const RENDERER_TYPE renderer_type                   /* i  : renderer type               */

#ifndef FIX_1123_FASTCONV_16BIT_ROM

    ,

    const int16_t allocate_init_flag /* i  : Memory allocation flag      */

#endif

)

{

    if ( input_config == IVAS_AUDIO_CONFIG_HOA3 || bin_input_config == BINAURAL_INPUT_AUDIO_CONFIG_HOA3 )
@@ -578,19 +590,19 @@ ivas_error ivas_allocate_binaural_hrtf( 
        else

        {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRReal_HOA3, BINAURAL_CONVBANDS, HOA3_CHANNELS, HrtfFastConv->ntaps_hrir_hoa3, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRReal_HOA3, BINAURAL_CONVBANDS, HOA3_CHANNELS, HrtfFastConv->ntaps_hrir_hoa3 ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRReal_HOA3" );

            }

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRImag_HOA3, BINAURAL_CONVBANDS, HOA3_CHANNELS, HrtfFastConv->ntaps_hrir_hoa3, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRImag_HOA3, BINAURAL_CONVBANDS, HOA3_CHANNELS, HrtfFastConv->ntaps_hrir_hoa3 ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRImag_HOA3" );

            }

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRReal_HOA3, BINAURAL_CONVBANDS, HOA3_CHANNELS, HrtfFastConv->ntaps_hrir_hoa3, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRReal_HOA3, BINAURAL_CONVBANDS, HOA3_CHANNELS, HrtfFastConv->ntaps_hrir_hoa3 ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRReal_HOA3" );

            }

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRImag_HOA3, BINAURAL_CONVBANDS, HOA3_CHANNELS, HrtfFastConv->ntaps_hrir_hoa3, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRImag_HOA3, BINAURAL_CONVBANDS, HOA3_CHANNELS, HrtfFastConv->ntaps_hrir_hoa3 ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRImag_HOA3" );

            }
@@ -624,19 +636,19 @@ ivas_error ivas_allocate_binaural_hrtf( 
        else

        {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRReal_HOA2, BINAURAL_CONVBANDS, HOA2_CHANNELS, HrtfFastConv->ntaps_hrir_hoa2, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRReal_HOA2, BINAURAL_CONVBANDS, HOA2_CHANNELS, HrtfFastConv->ntaps_hrir_hoa2 ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRReal_HOA2" );

            }

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRImag_HOA2, BINAURAL_CONVBANDS, HOA2_CHANNELS, HrtfFastConv->ntaps_hrir_hoa2, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRImag_HOA2, BINAURAL_CONVBANDS, HOA2_CHANNELS, HrtfFastConv->ntaps_hrir_hoa2 ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRImag_HOA2" );

            }

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRReal_HOA2, BINAURAL_CONVBANDS, HOA2_CHANNELS, HrtfFastConv->ntaps_hrir_hoa2, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRReal_HOA2, BINAURAL_CONVBANDS, HOA2_CHANNELS, HrtfFastConv->ntaps_hrir_hoa2 ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRReal_HOA2" );

            }

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRImag_HOA2, BINAURAL_CONVBANDS, HOA2_CHANNELS, HrtfFastConv->ntaps_hrir_hoa2, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRImag_HOA2, BINAURAL_CONVBANDS, HOA2_CHANNELS, HrtfFastConv->ntaps_hrir_hoa2 ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRImag_HOA2" );

            }
@@ -670,19 +682,19 @@ ivas_error ivas_allocate_binaural_hrtf( 
        else

        {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRReal_FOA, BINAURAL_CONVBANDS, FOA_CHANNELS, HrtfFastConv->ntaps_hrir_foa, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRReal_FOA, BINAURAL_CONVBANDS, FOA_CHANNELS, HrtfFastConv->ntaps_hrir_foa ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRReal_FOA" );

            }

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRImag_FOA, BINAURAL_CONVBANDS, FOA_CHANNELS, HrtfFastConv->ntaps_hrir_foa, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRImag_FOA, BINAURAL_CONVBANDS, FOA_CHANNELS, HrtfFastConv->ntaps_hrir_foa ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRImag_FOA" );

            }

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRReal_FOA, BINAURAL_CONVBANDS, FOA_CHANNELS, HrtfFastConv->ntaps_hrir_foa, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRReal_FOA, BINAURAL_CONVBANDS, FOA_CHANNELS, HrtfFastConv->ntaps_hrir_foa ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRReal_FOA" );

            }

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRImag_FOA, BINAURAL_CONVBANDS, FOA_CHANNELS, HrtfFastConv->ntaps_hrir_foa, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRImag_FOA, BINAURAL_CONVBANDS, FOA_CHANNELS, HrtfFastConv->ntaps_hrir_foa ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRImag_FOA" );

            }
@@ -716,19 +728,19 @@ ivas_error ivas_allocate_binaural_hrtf( 
        if ( ( HrtfFastConv->leftHRIRReal == NULL ) && ( HrtfFastConv->leftHRIRImag == NULL ) && ( HrtfFastConv->rightHRIRReal == NULL ) && ( HrtfFastConv->rightHRIRImag == NULL ) )

        {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRReal, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_hrir, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRReal, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_hrir ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRReal" );

            }

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRImag, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_hrir, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRImag, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_hrir ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRImag" );

            }

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRReal, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_hrir, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRReal, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_hrir ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRReal" );

            }

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRImag, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_hrir, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRImag, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_hrir ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRImag" );

            }
@@ -762,19 +774,19 @@ ivas_error ivas_allocate_binaural_hrtf( 
        if ( ( HrtfFastConv->leftBRIRReal == NULL ) && ( HrtfFastConv->leftBRIRImag == NULL ) && ( HrtfFastConv->rightBRIRReal == NULL ) && ( HrtfFastConv->rightBRIRImag == NULL ) )

        {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftBRIRReal, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_brir, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftBRIRReal, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_brir ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftBRIRReal" );

            }

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftBRIRImag, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_brir, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftBRIRImag, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_brir ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftBRIRImag" );

            }

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightBRIRReal, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_brir, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightBRIRReal, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_brir ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightBRIRReal" );

            }

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightBRIRImag, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_brir, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightBRIRImag, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_brir ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightBRIRImag" );

            }
@@ -907,12 +919,15 @@ static ivas_error ivas_binaural_hrtf_open( 
        {

            scaleFactorSBA = powf( 2.f, -1.f * FASTCONV_HRIR_FOA_factorQ );

        }

        HrtfFastConv->allocate_init_flag = 0; /* TODO: consider getting rid of this flag entirely? */

#else

        HrtfFastConv->allocate_init_flag = 1;

#endif



#ifdef FIX_1123_FASTCONV_16BIT_ROM

        if ( ( error = ivas_allocate_binaural_hrtf( HrtfFastConv, input_config, BINAURAL_INPUT_AUDIO_CONFIG_INVALID, renderer_type ) ) != IVAS_ERR_OK )

#else

        if ( ( error = ivas_allocate_binaural_hrtf( HrtfFastConv, input_config, BINAURAL_INPUT_AUDIO_CONFIG_INVALID, renderer_type, HrtfFastConv->allocate_init_flag ) ) != IVAS_ERR_OK )

#endif

        {

            return error;

        }
@@ -1614,8 +1629,12 @@ void ivas_binRenderer_close( 


static void ivas_free_pppHrtfMem(

    float ****ppppHRIR,

    const int16_t dim,

    const int16_t alloc_init )

    const int16_t dim

#ifndef FIX_1123_FASTCONV_16BIT_ROM

    ,

    const int16_t alloc_init

#endif

)

{

    int16_t i, j;
@@ -1623,14 +1642,18 @@ static void ivas_free_pppHrtfMem( 
    {

        for ( i = 0; i < BINAURAL_CONVBANDS; i++ )

        {

#ifndef FIX_1123_FASTCONV_16BIT_ROM

            if ( alloc_init == 0 )

            {

#endif

                for ( j = 0; j < dim; j++ )

                {

                    free( ( *ppppHRIR )[i][j] );

                    ( *ppppHRIR )[i][j] = NULL;

                }

#ifndef FIX_1123_FASTCONV_16BIT_ROM

            }

#endif

            free( ( *ppppHRIR )[i] );

            ( *ppppHRIR )[i] = NULL;

        }
@@ -1652,15 +1675,45 @@ void ivas_binaural_hrtf_close( 
    HRTFS_FASTCONV_HANDLE *hHrtfFastConv /* i  : fastconv HRTF handle */

)

{

#ifndef FIX_1123_FASTCONV_16BIT_ROM

    int16_t allocate_init_flag;

#endif



    if ( hHrtfFastConv == NULL || *hHrtfFastConv == NULL )

    {

        return;

    }



#ifndef FIX_1123_FASTCONV_16BIT_ROM

    allocate_init_flag = ( *hHrtfFastConv )->allocate_init_flag;

#endif



#ifdef FIX_1123_FASTCONV_16BIT_ROM

    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRReal, HRTF_LS_CHANNELS );

    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRImag, HRTF_LS_CHANNELS );

    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal, HRTF_LS_CHANNELS );

    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag, HRTF_LS_CHANNELS );



    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftBRIRReal, HRTF_LS_CHANNELS );

    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftBRIRImag, HRTF_LS_CHANNELS );

    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightBRIRReal, HRTF_LS_CHANNELS );

    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightBRIRImag, HRTF_LS_CHANNELS );



    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRReal_HOA3, HOA3_CHANNELS );

    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRImag_HOA3, HOA3_CHANNELS );

    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal_HOA3, HOA3_CHANNELS );

    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag_HOA3, HOA3_CHANNELS );



    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRReal_HOA2, HOA2_CHANNELS );

    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRImag_HOA2, HOA2_CHANNELS );

    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal_HOA2, HOA2_CHANNELS );

    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag_HOA2, HOA2_CHANNELS );



    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRReal_FOA, FOA_CHANNELS );

    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRImag_FOA, FOA_CHANNELS );

    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal_FOA, FOA_CHANNELS );

    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag_FOA, FOA_CHANNELS );

#else

    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRReal, HRTF_LS_CHANNELS, allocate_init_flag );

    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRImag, HRTF_LS_CHANNELS, allocate_init_flag );

    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal, HRTF_LS_CHANNELS, allocate_init_flag );
@@ -1685,6 +1738,7 @@ void ivas_binaural_hrtf_close( 
    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRImag_FOA, FOA_CHANNELS, allocate_init_flag );

    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal_FOA, FOA_CHANNELS, allocate_init_flag );

    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag_FOA, FOA_CHANNELS, allocate_init_flag );

#endif



    return;

}

lib_rend/ivas_stat_rend.h

+2 −1
Original line number Diff line number Diff line
@@ -1297,8 +1297,9 @@ typedef struct ivas_hrtfs_fastconv_struct 
    float ***rightHRIRImag_FOA;

    float FASTCONV_FOA_latency_s;



#ifndef FIX_1123_FASTCONV_16BIT_ROM

    int16_t allocate_init_flag; /*Memory allocation flag 0: if the hrtf pointers are allocated at application level , 1: of allocated at ivas_binaural_hrtf_open() */

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#else

    uint16_t ntaps_hrir;

    uint16_t ntaps_hrir_hoa3;

    uint16_t ntaps_hrir_hoa2;

lib_util/hrtf_file_reader.c

+122 −48

File changed.

Preview size limit exceeded, changes collapsed.

lib_util/hrtf_file_reader.h

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ void destroy_td_hrtf( 
 * free memory allocated for HRTF statistics binary data

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



ivas_error destroy_hrtf_statistics(

void destroy_hrtf_statistics(

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

);