Commit e6e02be0 authored by Serdar Buyuksarac's avatar Serdar Buyuksarac
Browse files

Rename statistics and add ivas_HRTF_statistics_binary_open to decoder

parent 5211de47

apps/decoder.c

+3 −3
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ int main( 
    IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;

    IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStat = NULL;

    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;

#endif

#endif

#ifdef DEBUGGING
@@ -809,12 +809,12 @@ int main( 
#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

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

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

        {

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

            goto cleanup;

        }

        if ( ( *hHrtfTD != NULL ) && ( error = load_reverb_binary( *hHrtfStat, arg.output_Fs, hrtfReader ) ) != IVAS_ERR_OK )

        if ( ( *hHrtfTD != NULL ) && ( error = load_reverb_binary( *hHrtfStatistics, arg.output_Fs, hrtfReader ) ) != IVAS_ERR_OK )

#else

        if ( ( *hHrtfTD != NULL ) && ( error = load_reverb_binary( *hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )

#endif

apps/renderer.c

+3 −3
Original line number Diff line number Diff line
@@ -766,7 +766,7 @@ int main( 
    IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;

    IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStat = NULL;

    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;

#endif

#endif

    IsmPositionProvider *positionProvider;
@@ -1113,12 +1113,12 @@ int main( 


#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

            if ( ( error = IVAS_REND_GetHrtfStatisticsHandle( hIvasRend, &hHrtfStat ) ) != IVAS_ERR_OK )

            if ( ( error = IVAS_REND_GetHrtfStatisticsHandle( hIvasRend, &hHrtfStatistics ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nIVAS_REND_GetHrtfStatisticsHandle failed\n\n" );

                goto cleanup;

            }

            if ( ( hHrtfStat != NULL ) && ( error = load_reverb_binary( *hHrtfStat, args.sampleRate, hrtfFileReader ) ) != IVAS_ERR_OK )

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

#else

            if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK )

#endif

lib_dec/ivas_init_dec.c

+7 −0
Original line number Diff line number Diff line
@@ -1103,6 +1103,13 @@ ivas_error ivas_init_decoder_front( 
        {

            return error;

        }



#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

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

        {

            return error;

        }

#endif

    }



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

lib_dec/lib_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -2190,7 +2190,7 @@ ivas_error IVAS_DEC_GetHrtfParamBinHandle( 


ivas_error IVAS_DEC_GetHrtfStatisticsHandle(

    IVAS_DEC_HANDLE hIvasDec,                         /* i/o: IVAS decoder handle                 */

    IVAS_DEC_HRTF_STATISTICS_HANDLE **hHrtfStat /* o  : Parametric binauralizer HRTF handle */

    IVAS_DEC_HRTF_STATISTICS_HANDLE **hHrtfStatistics /* o  : Parametric binauralizer HRTF handle */

)

{

    if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL || hIvasDec->st_ivas->hHrtfStatistics == NULL )
@@ -2198,7 +2198,7 @@ ivas_error IVAS_DEC_GetHrtfStatisticsHandle( 
        return IVAS_ERR_WRONG_PARAMS;

    }



    *hHrtfStat = &hIvasDec->st_ivas->hHrtfStatistics;

    *hHrtfStatistics = &hIvasDec->st_ivas->hHrtfStatistics;



    return IVAS_ERR_OK;

}

lib_dec/lib_dec.h

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

ivas_error IVAS_DEC_GetHrtfStatisticsHandle(

    IVAS_DEC_HANDLE hIvasDec,                   /* i/o: IVAS decoder handle                                                     */

    IVAS_DEC_HRTF_STATISTICS_HANDLE **hHrtfStat /* o  : HRTF statistics handle                                                  */

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

);

#endif