Commit aa43ed97 authored by vaclav's avatar vaclav
Browse files

- Merge branch '1963_ref_portFltMR-1568-1471-1690' of... 

- Merge branch '1963_ref_portFltMR-1568-1471-1690' of https://forge.3gpp.org/rep/sa4/audio/ivas-basop into 1963_ref_portFltMR-1568-1471-1690
parents 30cd9198 b71be07b

lib_com/options.h

+4 −3
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ 
#define FIX_CREND_SIMPLIFY_CODE

#ifdef FIX_CREND_SIMPLIFY_CODE

#define CHECK_BE_USING_OLD_ROM_TABLES_ONLY

#define FIX_989_TD_REND_ROM                             /* Eri: Clean-up for TD renderer and completion of ROM generation tool */

#define FIX_HRTF_LOAD                                   /* VA: issue 1187: fix memory issue when HRTFs are loaded from a binary file */

#ifdef CHECK_BE_USING_OLD_ROM_TABLES_ONLY

#define USE_NEW_CREND_ROM_TABLE
@@ -171,7 +170,9 @@ 
#define USE_NEW_REVERB_ROM_TABLES

#endif

#define USE_NEW_FASTCONV_PARAMBIN_ROM_TABLES

#define USE_NEW_TDREND_ROM_TABLES

#ifdef FIX_989_TD_REND_ROM

#define USE_NEW_TDREND_ROM_TABLES                       /* requires FIX_989_TD_REND_ROM */

#endif

#endif

#endif

#define FIX_1320_STACK_CPE_DECODER                      /* VA: issue 1320: Optimize the stack memory consumption in the CPE decoder */

lib_dec/lib_dec.c

+5 −3
Original line number Diff line number Diff line
@@ -2987,12 +2987,14 @@ ivas_error IVAS_DEC_VoIP_GetSamples( 
    uint16_t nSamplesPerChannel, /* i  : number of samples per channel requested to be written to output buffer                  */

    const IVAS_DEC_PCM_TYPE pcmType,

    void *pcmBuf,

    const uint32_t systemTimestamp_ms, /* i  : current system timestamp                    */

    const uint32_t systemTimestamp_ms /* i  : current system timestamp                    */

#ifdef FIX_CREND_SIMPLIFY_CODE

#ifdef SUPPORT_JBM_TRACEFILE

    ,

    JbmTraceFileWriterFn jbmWriterFn,

    void *jbmWriter,

    void *jbmWriter

#endif

    ,

    bool *bitstreamReadDone,   /* o  : flag indicating that bitstream was read                                 */

    uint16_t *nSamplesRendered /* o  : number of samples rendered                                              */

#else

lib_dec/lib_dec.h

+4 −3
Original line number Diff line number Diff line
@@ -283,12 +283,13 @@ ivas_error IVAS_DEC_VoIP_GetSamples( 
    uint16_t nSamplesPerChannel,                /* i  : number of samples per channel requested to be written to output buffer  */

    const IVAS_DEC_PCM_TYPE pcmType,

    void *pcmBuf,

    const uint32_t systemTimestamp_ms,          /* i  : current system timestamp                                                */

    const uint32_t systemTimestamp_ms          /* i  : current system timestamp                                                */

#ifdef FIX_CREND_SIMPLIFY_CODE

#ifdef SUPPORT_JBM_TRACEFILE

    JbmTraceFileWriterFn jbmWriterFn,

    void* jbmWriter,

    , JbmTraceFileWriterFn jbmWriterFn,

    void* jbmWriter

#endif

   ,

   bool *bitstreamReadDone,                     /* o  : flag indicating that bitstream was read                                 */

   uint16_t *nSamplesRendered                   /* o  : number of samples rendered                                              */

#else

lib_rend/ivas_rom_binaural_crend_head.h

+215 −3
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 


#include "ivas_cnst.h"





#ifdef USE_NEW_CREND_ROM_TABLE



/********************** CRendBin_Combined_HRIR **********************/
@@ -243,8 +243,6 @@ extern const float *CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS] 


/********************** CRendBin_Combined_BRIR **********************/



#ifdef USE_NEW_CREND_ROM_TABLE 



extern const float CRendBin_Combined_BRIR_latency_s;



/* Sample Rate = 48000 */
@@ -291,6 +289,201 @@ extern const float CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNE 


#else



/********************** CRendBin_Combined_HRIR **********************/



extern float CRendBin_Combined_HRIR_latency_s;



/* Sample Rate = 48000 */



extern int16_t CRendBin_Combined_HRIR_max_num_iterations_48kHz;

extern uint16_t CRendBin_Combined_HRIR_num_iterations_48kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS];

extern uint16_t CRendBin_Combined_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS];

extern uint16_t CRendBin_Combined_HRIR_pIndex_frequency_max_48kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS][1];

extern uint16_t CRendBin_Combined_HRIR_index_frequency_max_diffuse_48kHz;

extern float CRendBin_Combined_HRIR_inv_diffuse_weight_48kHz[BINAURAL_CHANNELS][15];

extern uint16_t *CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS];

extern float CRendBin_Combined_HRIR_coeff_re_48kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS][240];

extern float CRendBin_Combined_HRIR_coeff_im_48kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS][240];

extern float *CRendBin_Combined_HRIR_coeff_diffuse_re_48kHz[BINAURAL_CHANNELS];

extern float *CRendBin_Combined_HRIR_coeff_diffuse_im_48kHz[BINAURAL_CHANNELS];



/* Sample Rate = 32000 */



extern int16_t CRendBin_Combined_HRIR_max_num_iterations_32kHz;

extern uint16_t CRendBin_Combined_HRIR_num_iterations_32kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS];

extern uint16_t CRendBin_Combined_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS];

extern uint16_t CRendBin_Combined_HRIR_pIndex_frequency_max_32kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS][1];

extern uint16_t CRendBin_Combined_HRIR_index_frequency_max_diffuse_32kHz;

extern float CRendBin_Combined_HRIR_inv_diffuse_weight_32kHz[BINAURAL_CHANNELS][15];

extern uint16_t *CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS];

extern float CRendBin_Combined_HRIR_coeff_re_32kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS][160];

extern float CRendBin_Combined_HRIR_coeff_im_32kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS][160];

extern float *CRendBin_Combined_HRIR_coeff_diffuse_re_32kHz[BINAURAL_CHANNELS];

extern float *CRendBin_Combined_HRIR_coeff_diffuse_im_32kHz[BINAURAL_CHANNELS];



/* Sample Rate = 16000 */



extern int16_t CRendBin_Combined_HRIR_max_num_iterations_16kHz;

extern uint16_t CRendBin_Combined_HRIR_num_iterations_16kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS];

extern uint16_t CRendBin_Combined_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS];

extern uint16_t CRendBin_Combined_HRIR_pIndex_frequency_max_16kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS][1];

extern uint16_t CRendBin_Combined_HRIR_index_frequency_max_diffuse_16kHz;

extern float CRendBin_Combined_HRIR_inv_diffuse_weight_16kHz[BINAURAL_CHANNELS][15];

extern uint16_t *CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS];

extern float CRendBin_Combined_HRIR_coeff_re_16kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS][80];

extern float CRendBin_Combined_HRIR_coeff_im_16kHz[HRTF_LS_CHANNELS][BINAURAL_CHANNELS][80];

extern float *CRendBin_Combined_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS];

extern float *CRendBin_Combined_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS];









/********************** CRendBin_FOA_HRIR **********************/



extern float CRendBin_FOA_HRIR_latency_s;



/* Sample Rate = 48000 */



extern int16_t CRendBin_FOA_HRIR_max_num_iterations_48kHz;

extern uint16_t CRendBin_FOA_HRIR_num_iterations_48kHz[FOA_CHANNELS][BINAURAL_CHANNELS];

extern uint16_t CRendBin_FOA_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS];

extern uint16_t CRendBin_FOA_HRIR_pIndex_frequency_max_48kHz[FOA_CHANNELS][BINAURAL_CHANNELS][1];

extern uint16_t CRendBin_FOA_HRIR_index_frequency_max_diffuse_48kHz;

extern float CRendBin_FOA_HRIR_inv_diffuse_weight_48kHz[BINAURAL_CHANNELS][4];

extern uint16_t *CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS];

extern float CRendBin_FOA_HRIR_coeff_re_48kHz[FOA_CHANNELS][BINAURAL_CHANNELS][240];

extern float CRendBin_FOA_HRIR_coeff_im_48kHz[FOA_CHANNELS][BINAURAL_CHANNELS][240];

extern float *CRendBin_FOA_HRIR_coeff_diffuse_re_48kHz[BINAURAL_CHANNELS];

extern float *CRendBin_FOA_HRIR_coeff_diffuse_im_48kHz[BINAURAL_CHANNELS];



/* Sample Rate = 32000 */



extern int16_t CRendBin_FOA_HRIR_max_num_iterations_32kHz;

extern uint16_t CRendBin_FOA_HRIR_num_iterations_32kHz[FOA_CHANNELS][BINAURAL_CHANNELS];

extern uint16_t CRendBin_FOA_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS];

extern uint16_t CRendBin_FOA_HRIR_pIndex_frequency_max_32kHz[FOA_CHANNELS][BINAURAL_CHANNELS][1];

extern uint16_t CRendBin_FOA_HRIR_index_frequency_max_diffuse_32kHz;

extern float CRendBin_FOA_HRIR_inv_diffuse_weight_32kHz[BINAURAL_CHANNELS][4];

extern uint16_t *CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS];

extern float CRendBin_FOA_HRIR_coeff_re_32kHz[FOA_CHANNELS][BINAURAL_CHANNELS][160];

extern float CRendBin_FOA_HRIR_coeff_im_32kHz[FOA_CHANNELS][BINAURAL_CHANNELS][160];

extern float *CRendBin_FOA_HRIR_coeff_diffuse_re_32kHz[BINAURAL_CHANNELS];

extern float *CRendBin_FOA_HRIR_coeff_diffuse_im_32kHz[BINAURAL_CHANNELS];



/* Sample Rate = 16000 */



extern int16_t CRendBin_FOA_HRIR_max_num_iterations_16kHz;

extern uint16_t CRendBin_FOA_HRIR_num_iterations_16kHz[FOA_CHANNELS][BINAURAL_CHANNELS];

extern uint16_t CRendBin_FOA_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS];

extern uint16_t CRendBin_FOA_HRIR_pIndex_frequency_max_16kHz[FOA_CHANNELS][BINAURAL_CHANNELS][1];

extern uint16_t CRendBin_FOA_HRIR_index_frequency_max_diffuse_16kHz;

extern float CRendBin_FOA_HRIR_inv_diffuse_weight_16kHz[BINAURAL_CHANNELS][4];

extern uint16_t *CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS];

extern float CRendBin_FOA_HRIR_coeff_re_16kHz[FOA_CHANNELS][BINAURAL_CHANNELS][80];

extern float CRendBin_FOA_HRIR_coeff_im_16kHz[FOA_CHANNELS][BINAURAL_CHANNELS][80];

extern float *CRendBin_FOA_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS];

extern float *CRendBin_FOA_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS];







/********************** CRendBin_HOA2_HRIR **********************/



extern float CRendBin_HOA2_HRIR_latency_s;



/* Sample Rate = 48000 */



extern int16_t CRendBin_HOA2_HRIR_max_num_iterations_48kHz;

extern uint16_t CRendBin_HOA2_HRIR_num_iterations_48kHz[HOA2_CHANNELS][BINAURAL_CHANNELS];

extern uint16_t CRendBin_HOA2_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS];

extern uint16_t CRendBin_HOA2_HRIR_pIndex_frequency_max_48kHz[HOA2_CHANNELS][BINAURAL_CHANNELS][1];

extern uint16_t CRendBin_HOA2_HRIR_index_frequency_max_diffuse_48kHz;

extern float CRendBin_HOA2_HRIR_inv_diffuse_weight_48kHz[BINAURAL_CHANNELS][9];

extern uint16_t *CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS];

extern float CRendBin_HOA2_HRIR_coeff_re_48kHz[HOA2_CHANNELS][BINAURAL_CHANNELS][240];

extern float CRendBin_HOA2_HRIR_coeff_im_48kHz[HOA2_CHANNELS][BINAURAL_CHANNELS][240];

extern float *CRendBin_HOA2_HRIR_coeff_diffuse_re_48kHz[BINAURAL_CHANNELS];

extern float *CRendBin_HOA2_HRIR_coeff_diffuse_im_48kHz[BINAURAL_CHANNELS];



/* Sample Rate = 32000 */



extern int16_t CRendBin_HOA2_HRIR_max_num_iterations_32kHz;

extern uint16_t CRendBin_HOA2_HRIR_num_iterations_32kHz[HOA2_CHANNELS][BINAURAL_CHANNELS];

extern uint16_t CRendBin_HOA2_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS];

extern uint16_t CRendBin_HOA2_HRIR_pIndex_frequency_max_32kHz[HOA2_CHANNELS][BINAURAL_CHANNELS][1];

extern uint16_t CRendBin_HOA2_HRIR_index_frequency_max_diffuse_32kHz;

extern float CRendBin_HOA2_HRIR_inv_diffuse_weight_32kHz[BINAURAL_CHANNELS][9];

extern uint16_t *CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS];

extern float CRendBin_HOA2_HRIR_coeff_re_32kHz[HOA2_CHANNELS][BINAURAL_CHANNELS][160];

extern float CRendBin_HOA2_HRIR_coeff_im_32kHz[HOA2_CHANNELS][BINAURAL_CHANNELS][160];

extern float *CRendBin_HOA2_HRIR_coeff_diffuse_re_32kHz[BINAURAL_CHANNELS];

extern float *CRendBin_HOA2_HRIR_coeff_diffuse_im_32kHz[BINAURAL_CHANNELS];



/* Sample Rate = 16000 */



extern int16_t CRendBin_HOA2_HRIR_max_num_iterations_16kHz;

extern uint16_t CRendBin_HOA2_HRIR_num_iterations_16kHz[HOA2_CHANNELS][BINAURAL_CHANNELS];

extern uint16_t CRendBin_HOA2_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS];

extern uint16_t CRendBin_HOA2_HRIR_pIndex_frequency_max_16kHz[HOA2_CHANNELS][BINAURAL_CHANNELS][1];

extern uint16_t CRendBin_HOA2_HRIR_index_frequency_max_diffuse_16kHz;

extern float CRendBin_HOA2_HRIR_inv_diffuse_weight_16kHz[BINAURAL_CHANNELS][9];

extern uint16_t *CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS];

extern float CRendBin_HOA2_HRIR_coeff_re_16kHz[HOA2_CHANNELS][BINAURAL_CHANNELS][80];

extern float CRendBin_HOA2_HRIR_coeff_im_16kHz[HOA2_CHANNELS][BINAURAL_CHANNELS][80];

extern float *CRendBin_HOA2_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS];

extern float *CRendBin_HOA2_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS];







/********************** CRendBin_HOA3_HRIR **********************/



extern float CRendBin_HOA3_HRIR_latency_s;



/* Sample Rate = 48000 */



extern int16_t CRendBin_HOA3_HRIR_max_num_iterations_48kHz;

extern uint16_t CRendBin_HOA3_HRIR_num_iterations_48kHz[HOA3_CHANNELS][BINAURAL_CHANNELS];

extern uint16_t CRendBin_HOA3_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS];

extern uint16_t CRendBin_HOA3_HRIR_pIndex_frequency_max_48kHz[HOA3_CHANNELS][BINAURAL_CHANNELS][1];

extern uint16_t CRendBin_HOA3_HRIR_index_frequency_max_diffuse_48kHz;

extern float CRendBin_HOA3_HRIR_inv_diffuse_weight_48kHz[BINAURAL_CHANNELS][16];

extern uint16_t *CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_48kHz[BINAURAL_CHANNELS];

extern float CRendBin_HOA3_HRIR_coeff_re_48kHz[HOA3_CHANNELS][BINAURAL_CHANNELS][240];

extern float CRendBin_HOA3_HRIR_coeff_im_48kHz[HOA3_CHANNELS][BINAURAL_CHANNELS][240];

extern float *CRendBin_HOA3_HRIR_coeff_diffuse_re_48kHz[BINAURAL_CHANNELS];

extern float *CRendBin_HOA3_HRIR_coeff_diffuse_im_48kHz[BINAURAL_CHANNELS];



/* Sample Rate = 32000 */



extern int16_t CRendBin_HOA3_HRIR_max_num_iterations_32kHz;

extern uint16_t CRendBin_HOA3_HRIR_num_iterations_32kHz[HOA3_CHANNELS][BINAURAL_CHANNELS];

extern uint16_t CRendBin_HOA3_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS];

extern uint16_t CRendBin_HOA3_HRIR_pIndex_frequency_max_32kHz[HOA3_CHANNELS][BINAURAL_CHANNELS][1];

extern uint16_t CRendBin_HOA3_HRIR_index_frequency_max_diffuse_32kHz;

extern float CRendBin_HOA3_HRIR_inv_diffuse_weight_32kHz[BINAURAL_CHANNELS][16];

extern uint16_t *CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS];

extern float CRendBin_HOA3_HRIR_coeff_re_32kHz[HOA3_CHANNELS][BINAURAL_CHANNELS][160];

extern float CRendBin_HOA3_HRIR_coeff_im_32kHz[HOA3_CHANNELS][BINAURAL_CHANNELS][160];

extern float *CRendBin_HOA3_HRIR_coeff_diffuse_re_32kHz[BINAURAL_CHANNELS];

extern float *CRendBin_HOA3_HRIR_coeff_diffuse_im_32kHz[BINAURAL_CHANNELS];



/* Sample Rate = 16000 */



extern int16_t CRendBin_HOA3_HRIR_max_num_iterations_16kHz;

extern uint16_t CRendBin_HOA3_HRIR_num_iterations_16kHz[HOA3_CHANNELS][BINAURAL_CHANNELS];

extern uint16_t CRendBin_HOA3_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS];

extern uint16_t CRendBin_HOA3_HRIR_pIndex_frequency_max_16kHz[HOA3_CHANNELS][BINAURAL_CHANNELS][1];

extern uint16_t CRendBin_HOA3_HRIR_index_frequency_max_diffuse_16kHz;

extern float CRendBin_HOA3_HRIR_inv_diffuse_weight_16kHz[BINAURAL_CHANNELS][16];

extern uint16_t *CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS];

extern float CRendBin_HOA3_HRIR_coeff_re_16kHz[HOA3_CHANNELS][BINAURAL_CHANNELS][80];

extern float CRendBin_HOA3_HRIR_coeff_im_16kHz[HOA3_CHANNELS][BINAURAL_CHANNELS][80];

extern float *CRendBin_HOA3_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS];

extern float *CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS];







/********************** CRendBin_Combined_BRIR **********************/



extern float CRendBin_Combined_BRIR_latency_s;



/* Sample Rate = 48000 */
@@ -335,6 +528,25 @@ extern float CRendBin_Combined_BRIR_coeff_im_16kHz[HRTF_LS_CHANNELS][BINAURAL_CH 
extern float CRendBin_Combined_BRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS][2522];

extern float CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS][2522];





/********************** default HRIR reverb rom tables **********************/



/* Sample Rate = 48000 */



extern const float defaultHRIR_coherence_48kHz[LR_IAC_LENGTH_NR_FC];

extern const float defaultHRIR_left_avg_power_48kHz[LR_IAC_LENGTH_NR_FC];

extern const float defaultHRIR_right_avg_power_48kHz[LR_IAC_LENGTH_NR_FC];

/* Sample Rate = 32000 */



extern const float defaultHRIR_coherence_32kHz[LR_IAC_LENGTH_NR_FC];

extern const float defaultHRIR_left_avg_power_32kHz[LR_IAC_LENGTH_NR_FC];

extern const float defaultHRIR_right_avg_power_32kHz[LR_IAC_LENGTH_NR_FC];

/* Sample Rate = 16000 */



extern const float defaultHRIR_coherence_16kHz[LR_IAC_LENGTH_NR_FC_16KHZ];

extern const float defaultHRIR_left_avg_power_16kHz[LR_IAC_LENGTH_NR_FC_16KHZ];

extern const float defaultHRIR_right_avg_power_16kHz[LR_IAC_LENGTH_NR_FC_16KHZ];



#endif



/********************** default HRIR reverb rom tables **********************/

lib_util/ambi_convert.c

0 → 100644
+438 −0

File added.

Preview size limit exceeded, changes collapsed.