Commit 0c7eac65 authored by emerit's avatar emerit
Browse files

new tests compare rom to binary fx only, compare binary fx with binary float tolerance = 1

parent 9dfd8dfd

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ 
#define FIX_TDREND_HRTF_FILE_FORMAT                     /* Eri: fix point hrtf binary file format for TDREND */

#define FIX_TDREND_HRTF_FILE_FORMAT_OR                  /* OR: highligth changes in  FIX_TDREND_HRTF_FILE_FORMAT */

#define FIX_1115_FASTCONV_HRTF_FILE_LOAD                /* FhG: issue 1115: fix crash when loading FastConv-only binary HRTF file */



//#define TEST_FULL_16



#define FIX_1099_JBM_MD_HANDLE_ALLOC                    /* VA: issue 1099: Limit the allocation of `hJbmMetadata` handle to MASA and OMASA only */

#define FIX_1111_TDM_LSP_BUFFER                         /* VA: issue 1111: remove unused buffer `tdm_lspQ_PCh[]' */

lib_util/hrtf_file_reader.c

+28 −12
Original line number Diff line number Diff line
@@ -1673,9 +1673,13 @@ static ivas_error create_HRTF_from_rawdata_fx( 


            for ( k = 0; k < ( *hHRTF )->num_iterations[i][j]; k++ )

            {

                mem_size = ( *hHRTF )->pIndex_frequency_max[i][j][k] * sizeof( float );

                memcpy( pOut_to_bin_wptr, hrtf_data_rptr, mem_size );

                Word32 *ptW = (Word32 *) pOut_to_bin_wptr;

#ifdef TEST_FULL_16

                mem_size = ( *hHRTF )->pIndex_frequency_max[i][j][k] * sizeof( int16_t );

                Word16 *ptW = (Word16 *) hrtf_data_rptr;

#else

                mem_size = ( *hHRTF )->pIndex_frequency_max[i][j][k] * sizeof( int32_t );

                Word32 *ptW = (Word32 *) hrtf_data_rptr;

#endif

                for ( l = 0; l < ( *hHRTF )->pIndex_frequency_max[i][j][k]; l++ )

                {

                    pOut_to_bin_wptr[l] = (float) ptW[l] * powf( 2.f, -1.f * (float) factorQ );
@@ -1702,9 +1706,13 @@ static ivas_error create_HRTF_from_rawdata_fx( 
            pOut_to_bin_wptr = ( *hHRTF )->pOut_to_bin_im[i][j];

            for ( k = 0; k < ( *hHRTF )->num_iterations[i][j]; k++ )

            {

                mem_size = ( *hHRTF )->pIndex_frequency_max[i][j][k] * sizeof( float );

                memcpy( pOut_to_bin_wptr, hrtf_data_rptr, mem_size );

                Word32 *ptW = (Word32 *) pOut_to_bin_wptr;

#ifdef TEST_FULL_16

                mem_size = ( *hHRTF )->pIndex_frequency_max[i][j][k] * sizeof( int16_t );

                Word16 *ptW = (Word16 *) hrtf_data_rptr;

#else

                mem_size = ( *hHRTF )->pIndex_frequency_max[i][j][k] * sizeof( int32_t );

                Word32 *ptW = (Word32 *) hrtf_data_rptr;

#endif

                for ( l = 0; l < ( *hHRTF )->pIndex_frequency_max[i][j][k]; l++ )

                {

                    pOut_to_bin_wptr[l] = (float) ptW[l] * powf( 2.f, -1.f * (float) factorQ );
@@ -1738,9 +1746,13 @@ static ivas_error create_HRTF_from_rawdata_fx( 


            for ( k = 0; k < ( *hHRTF )->num_iterations_diffuse[j]; k++ )

            {

                mem_size = ( *hHRTF )->pIndex_frequency_max_diffuse[j][k] * sizeof( float );

                memcpy( pOut_to_bin_wptr, hrtf_data_rptr, mem_size );

                Word32 *ptW = (Word32 *) pOut_to_bin_wptr;

#ifdef TEST_FULL_16

                mem_size = ( *hHRTF )->pIndex_frequency_max_diffuse[j][k] * sizeof( int16_t );

                Word16 *ptW = (Word16 *) hrtf_data_rptr;

#else

                mem_size = ( *hHRTF )->pIndex_frequency_max_diffuse[j][k] * sizeof( int32_t );

                Word32 *ptW = (Word32 *) hrtf_data_rptr;

#endif

                for ( l = 0; l < ( *hHRTF )->pIndex_frequency_max_diffuse[j][k]; l++ )

                {

                    pOut_to_bin_wptr[l] = (float) ptW[l] * powf( 2.f, -1.f * (float) factorQ );
@@ -1764,9 +1776,13 @@ static ivas_error create_HRTF_from_rawdata_fx( 
            pOut_to_bin_wptr = ( *hHRTF )->pOut_to_bin_diffuse_im[j];

            for ( k = 0; k < ( *hHRTF )->num_iterations_diffuse[j]; k++ )

            {

                mem_size = ( *hHRTF )->pIndex_frequency_max_diffuse[j][k] * sizeof( float );

                memcpy( pOut_to_bin_wptr, hrtf_data_rptr, mem_size );

                Word32 *ptW = (Word32 *) pOut_to_bin_wptr;

#ifdef TEST_FULL_16

                mem_size = ( *hHRTF )->pIndex_frequency_max_diffuse[j][k] * sizeof( int16_t );

                Word16 *ptW = (Word16 *) hrtf_data_rptr;

#else

                mem_size = ( *hHRTF )->pIndex_frequency_max_diffuse[j][k] * sizeof( int32_t );

                Word32 *ptW = (Word32 *) hrtf_data_rptr;

#endif

                for ( l = 0; l < ( *hHRTF )->pIndex_frequency_max_diffuse[j][k]; l++ )

                {

                    pOut_to_bin_wptr[l] = (float) ptW[l] * powf( 2.f, -1.f * (float) factorQ );

scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c

+8 −0
Original line number Diff line number Diff line
@@ -2141,7 +2141,11 @@ int32_t compute_crend_hrtf_data_size_fx( crend_hrtf_tables_pointers *hrtf_table_ 
        {

            for ( iIter = 0; iIter < hrtf_table_ptrs->num_iterations[iIR * BINAURAL_CHANNELS + iChan]; iIter++ )

            {

#ifdef TEST_FULL_16

                hrtf_data_size += 2 * hrtf_table_ptrs->pIndex_frequency_max[iIndex++] * sizeof( Word16 ); // 2* : re & im

#else

                hrtf_data_size += 2 * hrtf_table_ptrs->pIndex_frequency_max[iIndex++] * sizeof( Word32 ); // 2* : re & im

#endif

            }

        }

    }
@@ -2158,7 +2162,11 @@ int32_t compute_crend_hrtf_data_size_fx( crend_hrtf_tables_pointers *hrtf_table_ 
        {

            for ( iIter = 0; iIter < hrtf_table_ptrs->num_iterations_diffuse[iChan]; iIter++ )

            {

#ifdef TEST_FULL_16

                hrtf_data_size += 2 * hrtf_table_ptrs->pIndex_frequency_max_diffuse[iIndex++] * sizeof( Word16 ); // 2* : re & im

#else

                hrtf_data_size += 2 * hrtf_table_ptrs->pIndex_frequency_max_diffuse[iIndex++] * sizeof( Word32 ); // 2* : re & im

#endif

            }

        }

    }