Commit 684cfcfa authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch... 

Merge branch '922-use-precomputed-HRTF-average-LR-energies-and-IAC-in-all-renderers' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into 922-use-precomputed-HRTF-average-LR-energies-and-IAC-in-all-renderers
parents d4d8db92 1dfbd32b

lib_rend/ivas_objectRenderer_mix.c

+0 −1
Original line number Diff line number Diff line
@@ -404,7 +404,6 @@ static ivas_error DefaultBSplineModel( 
    modelITD = &( HrFiltSet_p->ModelParamsITD );



#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

    /*TODO(922): Check ModelRom*/

#else

    switch ( output_Fs )

    {

lib_rend/ivas_prot_rend.h

+0 −1
Original line number Diff line number Diff line
@@ -1203,7 +1203,6 @@ ivas_error ivas_reverb_prepare_cldfb_params( 
    float *pOutput_ene );

#else

ivas_error ivas_reverb_prepare_cldfb_params(

    IVAS_ROOM_ACOUSTICS_CONFIG_DATA *pInput_params,

    IVAS_ROOM_ACOUSTICS_CONFIG_DATA *pInput_params,

    const HRTFS_FASTCONV_HANDLE hHrtfFastConv,

    const AUDIO_CONFIG input_audio_config,

lib_rend/lib_rend.c

+0 −3
Original line number Diff line number Diff line
@@ -280,9 +280,6 @@ 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;

lib_util/hrtf_file_reader.c

+4 −0
Original line number Diff line number Diff line
@@ -736,7 +736,11 @@ ivas_error load_reverb_binary( 
{

    fseek( hrtfReader->file, 0, SEEK_SET );



#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

    return load_reverb_from_binary( hHrtfStatistics, sampleRate, hrtfReader->file );

#else

    return load_reverb_from_binary( hHrtf, hrtfReader->file );

#endif

}

#endif

lib_util/hrtf_file_reader.h

+2 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ ivas_error destroy_td_hrtf( 
    IVAS_DEC_HRTF_HANDLE *hHRTF /* i/o: HRTF handle */

);



#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

/*---------------------------------------------------------------------*

 * destroy_hrtf_statistics()

 *
@@ -207,6 +208,7 @@ ivas_error destroy_td_hrtf( 
ivas_error destroy_hrtf_statistics(

    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics /* i/o: HRTF statistics handle  */

);

#endif



#else

/*---------------------------------------------------------------------*

lib_rend/ivas_hrtf.c

+2 −2

File changed.

Contains only whitespace changes.