Commit dfcbfd4e authored by Jan Brouwer's avatar Jan Brouwer
Browse files

added lr_energy_and_iac at decoder and renderers

parent aa53dd24

lib_dec/ivas_stat_dec.h

+1 −0
Original line number Diff line number Diff line
@@ -1120,6 +1120,7 @@ typedef struct Decoder_Struct 
    HRTFS_CREND_HANDLE hSetOfHRTF;                             /* Set of HRTFs handle (CRend) */

    HRTFS_FASTCONV_HANDLE hHrtfFastConv;                       /* FASTCONV HRTF tables for binaural rendering */

    HRTFS_PARAMBIN_HANDLE hHrtfParambin;                       /* HRTF tables for parametric binauralizer */

    float *lr_energy_and_iac[3];

    LSSETUP_CUSTOM_HANDLE hLsSetupCustom;                      /* Custom LS configuration handle */

    float *hoa_dec_mtx;                                        /* Pointer to decoder matrix for SBA */

    HEAD_TRACK_DATA_HANDLE hHeadTrackData;                     /* Head tracking data structure */

lib_rend/ivas_crend.c

+1 −1
Original line number Diff line number Diff line
@@ -1611,7 +1611,7 @@ ivas_error ivas_rend_openCrend( 


            if ( outConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

            {

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

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

                {

                    return error;

                }

lib_rend/ivas_stat_rend.h

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

    HRTFS_DATA *hHRTF_hrir_foa;

    HRTFS_DATA *hHRTF_brir_combined;

    float *lr_energy_and_iac[3];



} HRTFS_CREND, *HRTFS_CREND_HANDLE;
@@ -1332,6 +1333,7 @@ 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() */



    float *lr_energy_and_iac[3];

    float fastconvReverberationTimes[CLDFB_NO_CHANNELS_MAX];

    float fastconvReverberationEneCorrections[CLDFB_NO_CHANNELS_MAX];
@@ -1342,6 +1344,7 @@ 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];



    float *lr_energy_and_iac[3];

    float parametricReverberationTimes[CLDFB_NO_CHANNELS_MAX];

    float parametricReverberationEneCorrections[CLDFB_NO_CHANNELS_MAX];

    float parametricEarlyPartEneCorrection[CLDFB_NO_CHANNELS_MAX];

lib_rend/lib_rend.c

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

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    hrtf_handles hHrtfs;

    float *lr_energy_and_iac[3];

#else

    IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF;

    IVAS_DEC_HRTF_FASTCONV_HANDLE hHrtfFastConv;