Commit 443e609d authored by emerit's avatar emerit
Browse files

merging

parent 95ba28ed

apps/decoder.c

+16 −0
Original line number Diff line number Diff line
@@ -550,7 +550,11 @@ int main( 


    if ( arg.hrtfReaderEnabled )

    {

#ifdef FIX_POINT_HRTF_FILE_FORMAT

        IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;

#else

        IVAS_DEC_HRTF_HANDLE hHrtfTD = NULL;

#endif



        if ( ( error = IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD ) ) != IVAS_ERR_OK )

        {
@@ -564,7 +568,11 @@ int main( 
            goto cleanup;

        }



#ifdef FIX_POINT_HRTF_FILE_FORMAT

        IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;

#else

        IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF = NULL;

#endif

        if ( ( error = IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_GetHrtfCRendHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -577,7 +585,11 @@ int main( 
            goto cleanup;

        }



#ifdef FIX_POINT_HRTF_FILE_FORMAT

        IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;

#else

        IVAS_DEC_HRTF_FASTCONV_HANDLE hHrtfFastConv = NULL;

#endif

        if ( ( error = IVAS_DEC_GetHrtfFastConvHandle( hIvasDec, &hHrtfFastConv ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_GetHrtfFastConvHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -590,7 +602,11 @@ int main( 
            goto cleanup;

        }



#ifdef FIX_POINT_HRTF_FILE_FORMAT

        IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;

#else

        IVAS_DEC_HRTF_PARAMBIN_HANDLE hHrtfParambin = NULL;

#endif

        if ( ( error = IVAS_DEC_GetHrtfParamBinHandle( hIvasDec, &hHrtfParambin ) ) != IVAS_ERR_OK )

        {

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

lib_com/options.h

+2 −2
Original line number Diff line number Diff line
@@ -85,16 +85,16 @@ 
#define CR_2109_to_2112_cd0_ce0  /* This is related to the CRs include in the 26.444 package of 21-12. Concerns lead_deindexing and  */

#define FIX_QMETADATA_PENALTY /* Nokia: transform penalty calculation in qmetadata into integer operations */



#define FIX_POINT_HRTF_FILE_FORMAT          /* ORANGE : add crend changes and fix point binaural rom and hrtf binary file format */

//#define FIX_POINT_HRTF_FILE_FORMAT          /* ORANGE : add crend changes and fix point binaural rom and hrtf binary file format */

// #define FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM                     /* FhG: issue 1123: update FastConv and ParamBin ROM tables and scripts to generate 16 bit tables instead of float */

//#define FIX_POINT_HRTF_FILE_FORMAT_REVERB          /* ORANGE : add crend changes and fix point binaural rom and hrtf binary file format */

// #define FIX_POINT_CREND_HRTF_FILE_FORMAT

//#define FIX_TDREND_HRTF_FILE_FORMAT

//#define FIX_POINT_HRTF_FILE_OPTIM

#ifdef FIX_POINT_HRTF_FILE_OPTIM

#define FIX_POINT_HRTF_FILE_FORMAT

#endif

#ifdef FIX_POINT_HRTF_FILE_FORMAT

#define FIX_POINT_HRTF_FILE_OPTIM

#define FIX_POINT_HRTF_FILE_FORMAT_REVERB

#define FIX_POINT_CREND_HRTF_FILE_FORMAT

#define FIX_TDREND_HRTF_FILE_FORMAT

lib_rend/ivas_crend.c

+260 −562

File changed.

Preview size limit exceeded, changes collapsed.

lib_rend/ivas_hrtf.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ ivas_error ivas_HRTF_CRend_binary_open_fx( 
}

#endif



#ifdef FIX_POINT_HRTF_FILE_OPTIM

#ifdef FIX_POINT_CREND_HRTF_FILE_FORMAT



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

 * ivas_HRTF_CRend_binary_open_buffers_uint16()

lib_rend/ivas_prot_rend.h

+1 −1
Original line number Diff line number Diff line
@@ -891,7 +891,7 @@ ivas_error ivas_HRTF_CRend_binary_open_fx( 
#endif

);



#ifdef FIX_POINT_HRTF_FILE_OPTIM

#ifdef FIX_POINT_CREND_HRTF_FILE_FORMAT

ivas_error ivas_HRTF_CRend_binary_open_buffers_uint16(

    uint16_t **buffer,                                          /* o  : buffer to allocate                      */

    const uint32_t mem_size                                     /* i  : size of buffer                          */