Commit 0d83bff8 authored by multrus's avatar multrus
Browse files

Merge branch '1157-obsolete-table-ivas_param_mc_dmx_fac_cicp19_4tc-in-ivas_rom_com-c' into 'main'

Resolve "Obsolete table ivas_param_mc_dmx_fac_CICP19_4tc[] in ivas_rom_com.c"

See merge request !1724
parents 2d29f44a 3099e75b
Loading
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -1876,6 +1876,7 @@ 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*/
@@ -1883,6 +1884,7 @@ const float ivas_param_mc_dmx_fac_CICP19_4tc[48] =
    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] =
+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@
#endif
#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_1152_UNINIT_VAL_IN_ITD_VAD_COMPUTATION      /* FhG: fix uninitialized value being used in ITD VAD mid signal computation that does not affect synthesis, but crashes BASOPs */
#define FIX_1157_OBSOLETE_DMX_TABLE                     /* FhG: remove obsolte ParamMC DMX table ivas_param_mc_dmx_fac_CICP19_4tc[] */

/* #################### End BE switches ################################## */