Commit d9500884 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/ivas-float-update' into 1925-ref-PortFlpMr1911

parents 267ba552 cec8a4fd

lib_com/ivas_cnst.h

+2 −0
Original line number Diff line number Diff line
@@ -183,7 +183,9 @@ typedef enum 


typedef enum

{

#ifndef FIX_1101_CLEANING_JBM_CALL

    TC_BUFFER_MODE_NONE = 0,

#endif

    TC_BUFFER_MODE_RENDERER,

    TC_BUFFER_MODE_BUFFER

} TC_BUFFER_MODE;

lib_com/ivas_prot.h

+4 −0
Original line number Diff line number Diff line
@@ -3085,7 +3085,11 @@ void mctStereoIGF_enc( 
    MCT_ENC_HANDLE hMCT,                                        /* i/o: MCT encoder structure                   */

    Encoder_State **sts,                                        /* i/o: encoder state structure                 */

    float *orig_spectrum[MCT_MAX_CHANNELS][NB_DIV],             /* i  : MDCT spectrum for ITF                   */

#ifdef NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC

    float *powerSpec[MCT_MAX_CHANNELS],                         /* i/o: MDCT^2 + MDST^2 spectrum,or estimate    */

#else

    float powerSpec[MCT_MAX_CHANNELS][L_FRAME48k],              /* i/o: MDCT^2 + MDST^2 spectrum,or estimate    */

#endif

    float *powerSpecMsInv[MCT_MAX_CHANNELS][NB_DIV],            /* i  : same as above but for inverse spect.    */

    float *inv_spectrum[MCT_MAX_CHANNELS][NB_DIV],              /* i  : inverse spectrum                        */

    const int16_t sp_aud_decision0[MCT_MAX_CHANNELS]            /* i  : speech audio decision                   */

lib_com/ivas_rom_com.c

+7 −0
Original line number Diff line number Diff line
@@ -2473,6 +2473,13 @@ const uint16_t ivas_param_mc_sym_freq_ild_delta_combined_48_16bits[2 * PARAM_MC_ 
 * MASA ROM tables

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













#ifdef FIX_1121_MASA_DESCRIPTOR













const uint8_t ivasmasaFormatDescriptor[8] = 













{ 













    0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 /* "IVASMASA" */













};

























#endif















const float diffuseness_reconstructions_hr[HR_MASA_ER_LEVELS] =















{















     0.00f,

































lib_com/ivas_rom_com.h



+4
−0




























Original line number
Diff line number
Diff line








@@ -264,6 +264,10 @@ extern const uint16_t ivas_param_mc_sym_freq_icc_delta_combined_48_16bits[2 * PA













 * MASA ROM tables















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





























#ifdef FIX_1121_MASA_DESCRIPTOR













extern const uint8_t ivasmasaFormatDescriptor[8]; /* "IVASMASA" */



























#endif















extern const int16_t bits_direction_masa[DIRAC_DIFFUSE_LEVELS];















extern const int16_t no_theta_masa[NO_SPHERICAL_GRIDS - 2];















extern const int16_t no_phi_masa[NO_SPHERICAL_GRIDS][MAX_NO_THETA];

































lib_com/options.h



+6
−0




























Original line number
Diff line number
Diff line








@@ -185,15 +185,21 @@













#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */ 















#define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART             /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */















#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */













#define NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC      /* FhG: fix out-of-bound errors when switching from SID frame to active frame*/















#define NONBE_FIX_1052_SBA_EXT_FIX                      /* VA: SBA external output support fix - do not overwrite "output_config" parameter */















#define FIX_1113_CLDFB_REND_IN_ISAR                     /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */















#define NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING       /* VA: issue 1110: fix encoder crash in the stereo DTX bitrate switching condition */













#define FIX_1099_JBM_MD_HANDLE_ALLOC                    /* VA: issue 1099: Limit the allocation of `hJbmMetadata` handle to MASA and OMASA only */













#define FIX_1121_MASA_DESCRIPTOR                        /* VA: issue 1121: Define 'ivasmasaFormatDescriptor' at one common place */















#define NONBE_1894_OSBA_SCALING                         /* FhG: port OSBA scaling MRs (298,355,360) jointly */















#define NONBE_FIX_1141_OSBA_ROOM_RENDERING              /* FhG: Fix for issue 1141: render objects in OSBA decoder with room effect  */















#define NONBE_1360_LFE_DELAY                            /* Dlb: LFE delay alignment when rendering in CLDFB domain*/















#define NONBE_1229_FIX_ISM1_DPID                        /* Eri: issue 1229: fix bug causing ISM 1 to use default -dpid instead of the specified one */















#define NONBE_SVD_OPTIMIZATION















#define FIX_1158_FASTCONV_REVERB_HRTF                   /* Philips: issue 1158: Rendering with FastConv to BINAURAL_ROOM_REVERB uses BRIR convolution instead of HRTF */













#define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR       /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */













#define NONBE_1131_ACELP_OOB                            /* VA: issue 1131: fix division-by-zero in acelp gain decoding caused by wrong length of buffer update when switching from HQ core to ACELP core */













#define FIX_1101_CLEANING_JBM_CALL                      /* VA: issue 1101: remove obsolete call of ivas_jbm_dec_tc_buffer_open() */































/* #################### End BASOP porting switches ############################ */