Commit 94bcc129 authored by kinuthia's avatar kinuthia
Browse files

fix issue 675 under define FIX_674_MISSING_TABLES_FOR_TDREND_REVERB 

- add 32kHz and 16kHz rom tables used for reverb in td renderer path
- update 48kHz tables
- update generate_tables_from_rom_to_bin.c to write the rom tables to bin
- update hrtf binaries in
  scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_*.bin
- read tables from bin if reading hrtf from binary file
parent 640e85a7

lib_com/ivas_cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -1683,6 +1683,10 @@ typedef enum 
#define MAX_ANGULAR_STEP_INV                    ( 1.0f / MAX_ANGULAR_STEP )

#define MAX_INTERPOLATION_STEPS                 12



#ifdef FIX_674_MISSING_TABLES_FOR_TDREND_REVERB

#define LR_IAC_LENGTH_NR_FC                     ( RV_LENGTH_NR_FC )

#endif



/* ----- Enums - TD Renderer ----- */



typedef enum

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ 
#define FIX_653_BUG_IN_SKIP_MATRIX                      /* Dlb: fix for issue #653, bug in the ivas_spar_get_skip_mat function*/

#define FIX_663_PARAM_ISM_EXT                           /* FhG: Issue 663: ParamISM EXT output improvement */



#define FIX_674_MISSING_TABLES_FOR_TDREND_REVERB        /* Eri: add tables for 32kHz, 16kHz (and update 48kHz) for left/right energies and coherence for late reverb in TD renderer path. Also read tables from binary when hrtf binaries are used. */



/* ################## End BE DEVELOPMENT switches ######################### */

lib_dec/ivas_init_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -1654,7 +1654,11 @@ ivas_error ivas_init_decoder( 


        if ( st_ivas->hIntSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

        {

#ifdef FIX_674_MISSING_TABLES_FOR_TDREND_REVERB

            if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hDecoderConfig->output_config, NULL, st_ivas->hBinRendererTd->HrFiltSet_p->lr_energy_and_iac, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

#else

            if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hDecoderConfig->output_config, NULL, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

#endif

            {

                return error;

            }

lib_dec/ivas_ism_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -198,7 +198,11 @@ static ivas_error ivas_ism_bitrate_switching( 
#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

                if ( st_ivas->hIntSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

                {

#ifdef FIX_674_MISSING_TABLES_FOR_TDREND_REVERB

                    if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hDecoderConfig->output_config, NULL, st_ivas->hBinRendererTd->HrFiltSet_p->lr_energy_and_iac, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

#else

                    if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hDecoderConfig->output_config, NULL, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

#endif

                    {

                        return error;

                    }

lib_rend/ivas_crend.c

+4 −0
Original line number Diff line number Diff line
@@ -1135,7 +1135,11 @@ ivas_error ivas_rend_openCrend( 


            if ( outConfig == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

            {

#ifdef FIX_674_MISSING_TABLES_FOR_TDREND_REVERB

                if ( ( error = ivas_reverb_open( &( hCrend->hReverb ), inConfig, ( *pCrend )->hHrtfCrend, NULL, hRendCfg, output_Fs ) ) != IVAS_ERR_OK )

#else

                if ( ( error = ivas_reverb_open( &( hCrend->hReverb ), inConfig, ( *pCrend )->hHrtfCrend, hRendCfg, output_Fs ) ) != IVAS_ERR_OK )

#endif

                {

                    return error;

                }