Commit df3612fe authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1157_OBSOLETE_DMX_TABLE

parent 34fbaf41

lib_com/ivas_rom_com.c

+0 −9
Original line number Diff line number Diff line
@@ -1876,15 +1876,6 @@ const float ivas_param_mc_dmx_fac_CICP19_3tc[36] = 
    0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f /*Ct*/

};













#ifndef FIX_1157_OBSOLETE_DMX_TABLE













const float ivas_param_mc_dmx_fac_CICP19_4tc[48] =













{













    1.0f, 0.0f, INV_SQRT2, INV_SQRT2, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, /*Lht*/













    0.0f, 1.0f, INV_SQRT2, INV_SQRT2, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, /*Rht*/













    0.0f, 0.0f, 0.0f,      0.0f,      0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, /*Lut*/













    0.0f, 0.0f, 0.0f,      0.0f,      0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, /*Rut*/













};













#endif





























/* Coefficient for Parametric MC ILD factorization */















const float ivas_param_mc_ild_fac_CICP6_2tc[6] =

































lib_com/options.h



+0
−1




























Original line number
Diff line number
Diff line








@@ -157,7 +157,6 @@













/* #################### Start BASOP porting switches ############################ */































#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */













#define FIX_1157_OBSOLETE_DMX_TABLE                     /* FhG: remove obsolte ParamMC DMX table ivas_param_mc_dmx_fac_CICP19_4tc[] */















#define NONBE_1325_TD_STEREO_QUANT_LSF_SEC              /* Nokia: issue 1325: fix for usage of active_cnt variable in TD stereo LSFQ */















#define NONBE_FIX_1130_DIV_ZERO_LEV_DUR                 /* VA: issue 1130: avoid div by zero in L-D by thresholding R[0] to a min value of 100.0 */















#define NONBE_1329_FIX_OSBA_CRASH                       /* FhG: issue 1329: prevent assert when bit budget is low*/