Commit 644841dc authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

add FIX_1123_CREND_16BIT_FMT and disable 16 bit ROM for CREND

parent ab11c28d

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -166,7 +166,8 @@ 


#define FIX_POINT_HRTF_FILE_FORMAT                     /* All: fix point hrtf binary file format */

#ifdef FIX_POINT_HRTF_FILE_FORMAT

#define FIX_1123_CREND_16BIT_ROM                        /* Ora: update CREND ROM tables to 16 bit */

/*#define FIX_1123_CREND_16BIT_ROM*/                    /* Ora: update CREND ROM tables to 16 bit */

#define FIX_1123_CREND_16BIT_FMT                        /* Ora: update CREND binary file format to 16 bit */

/*#define FIX_1123_TDREN_16BIT_ROM*/                    /* Eri,Ora: update TD Object Renderer tables to 16 bit */

/*#define FIX_1123_FASTCONV_16BIT_ROM*/                 /* FhG: issue 1123: update FastConv ROM tables to 16 bit (must regenerate ROM file!) */

#define FIX_1123_FASTCONV_16BIT_FMT                     /* FhG: issue 1123: update FastConv binary file format and scripts to 16 bit */

lib_rend/ivas_rom_binaural_crend_head.c

+80 −7420

File changed.

Preview size limit exceeded, changes collapsed.

lib_rend/ivas_rom_binaural_crend_head.h

+119 −393

File changed.

Preview size limit exceeded, changes collapsed.

lib_util/hrtf_file_reader.c

+4 −4
Original line number Diff line number Diff line
@@ -1737,7 +1737,7 @@ static ivas_error create_HRTF_from_rawdata( 


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

            {

#ifdef FIX_1123_CREND_16BIT_ROM

#ifdef FIX_1123_CREND_16BIT_FMT

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

                Word16 *ptW = (Word16 *) hrtf_data_rptr;

#else
@@ -1770,7 +1770,7 @@ static ivas_error create_HRTF_from_rawdata( 
            pOut_to_bin_wptr = ( *hHRTF )->pOut_to_bin_im[i][j];

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

            {

#ifdef FIX_1123_CREND_16BIT_ROM

#ifdef FIX_1123_CREND_16BIT_FMT

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

                Word16 *ptW = (Word16 *) hrtf_data_rptr;

#else
@@ -1810,7 +1810,7 @@ static ivas_error create_HRTF_from_rawdata( 


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

            {

#ifdef FIX_1123_CREND_16BIT_ROM

#ifdef FIX_1123_CREND_16BIT_FMT

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

                Word16 *ptW = (Word16 *) hrtf_data_rptr;

#else
@@ -1840,7 +1840,7 @@ static ivas_error create_HRTF_from_rawdata( 
            pOut_to_bin_wptr = ( *hHRTF )->pOut_to_bin_diffuse_im[j];

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

            {

#ifdef FIX_1123_CREND_16BIT_ROM

#ifdef FIX_1123_CREND_16BIT_FMT

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

                Word16 *ptW = (Word16 *) hrtf_data_rptr;

#else

scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c

+2 −2
Original line number Diff line number Diff line
@@ -1958,7 +1958,7 @@ int32_t compute_crend_hrtf_data_size( crend_hrtf_tables_pointers *hrtf_table_ptr 
        {

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

            {

#ifdef FIX_1123_CREND_16BIT_ROM

#ifdef FIX_1123_CREND_16BIT_FMT

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

#else

                hrtf_data_size += 2 * hrtf_table_ptrs->pIndex_frequency_max[iIndex++] * sizeof( int32_t ); // 2* : re & im
@@ -1975,7 +1975,7 @@ int32_t compute_crend_hrtf_data_size( crend_hrtf_tables_pointers *hrtf_table_ptr 
        {

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

            {

#ifdef FIX_1123_CREND_16BIT_ROM

#ifdef FIX_1123_CREND_16BIT_FMT

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

#else

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