Commit d96a6c30 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-temp' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into 922-use-precomputed-HRTF-average-LR-energies-and-IAC-in-all-renderers-temp
parents 7ba8dec4 b82eafdc

lib_rend/ivas_prot_rend.h

+2 −1
Original line number Diff line number Diff line
@@ -1003,7 +1003,8 @@ ivas_error ivas_binaural_reverb_open_fastconv( 
    const int16_t numBins,                                      /* i  : number of CLDFB bins                    */

    const int16_t numCldfbSlotsPerFrame,                        /* i  : number of CLDFB slots per frame         */

    IVAS_ROOM_ACOUSTICS_CONFIG_DATA *roomAcoustics,             /* i/o: room acoustics parameters               */

#ifndef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

#else

    const AUDIO_CONFIG internal_config,                         /* i  : internal audio config for FastConv      */

#endif

    const int32_t sampling_rate,                                /* i  : sampling rate                           */

lib_rend/ivas_reverb.c

+2 −1
Original line number Diff line number Diff line
@@ -1919,7 +1919,8 @@ ivas_error ivas_binaural_reverb_open_fastconv( 
    const int16_t numBins,                          /* i  : number of CLDFB bins                 */

    const int16_t numCldfbSlotsPerFrame,            /* i  : number of CLDFB slots per frame      */

    IVAS_ROOM_ACOUSTICS_CONFIG_DATA *roomAcoustics, /* i/o: room acoustics parameters            */

#ifndef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

#else 

    const AUDIO_CONFIG internal_config, /* i  : internal audio config for FastConv   */

#endif

    const int32_t sampling_rate,              /* i  : sampling rate                        */