Commit 30c67d12 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Compiler switch for #922 added

parent 932b16b8

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ 
#define NONBE_FIX_DISCRETE_ISM_NOISE_SEED_HANDLING            /* FhG: fix handling of common and differing noise seeds in SCEs for ISM DTX */

#define NONBE_FIX_913_OMASA_BITBUDGET_VIOLATION               /* VA/Nok: issue 913: Resolve "Crash in OMASA encoder - DFT-Stereo bit-budget violated" */

#define NONBE_FIX_855_JBM_FLUSH_OFFSET                        /* FhG: issue #855: add missing switch here for the code in JBM flushing */

#define NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES             /* Philips: Use pre-computed HRTF average L/R energies and IAC in all renderers */



/* ##################### End NON-BE switches ########################### */

lib_rend/ivas_crend.c

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


            if ( outConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

            {

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

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

#else

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

#endif

                {

                    return error;

                }

lib_rend/ivas_stat_rend.h

+6 −0
Original line number Diff line number Diff line
@@ -1294,7 +1294,9 @@ typedef struct ivas_hrtfs_crend_structure 
    HRTFS_DATA *hHRTF_hrir_hoa2;

    HRTFS_DATA *hHRTF_hrir_foa;

    HRTFS_DATA *hHRTF_brir_combined;

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

    float *lr_energy_and_iac[3];

#endif



} HRTFS_CREND, *HRTFS_CREND_HANDLE;
@@ -1333,7 +1335,9 @@ typedef struct ivas_hrtfs_fastconv_struct 


    int16_t allocate_init_flag; /*Memory allocation flag 0: if the hrtf pointers are allocated at application level , 1: of allocated at ivas_binaural_hrtf_open() */



#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

    float *lr_energy_and_iac[3];

#endif

    float fastconvReverberationTimes[CLDFB_NO_CHANNELS_MAX];

    float fastconvReverberationEneCorrections[CLDFB_NO_CHANNELS_MAX];
@@ -1344,7 +1348,9 @@ typedef struct ivas_hrtfs_parambin_struct 
    float hrtfShCoeffsRe[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS];

    float hrtfShCoeffsIm[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS];



#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

    float *lr_energy_and_iac[3];

#endif

    float parametricReverberationTimes[CLDFB_NO_CHANNELS_MAX];

    float parametricReverberationEneCorrections[CLDFB_NO_CHANNELS_MAX];

    float parametricEarlyPartEneCorrection[CLDFB_NO_CHANNELS_MAX];

lib_rend/lib_rend.c

+2 −0
Original line number Diff line number Diff line
@@ -277,7 +277,9 @@ struct IVAS_REND 
    int16_t num_subframes;

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    hrtf_handles hHrtfs;

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

    float *lr_energy_and_iac[3];

#endif

#else

    IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF;

    IVAS_DEC_HRTF_FASTCONV_HANDLE hHrtfFastConv;