Commit e9175ff1 authored by multrus's avatar multrus
Browse files

for ParamMC: change static scaling to constant 4.0, which reduces the...

for ParamMC: change static scaling to constant 4.0, which reduces the worst-case and corresponds to a simple 2-bit shift
parent 1df39ca6
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -1832,7 +1832,7 @@ const int16_t Param_MC_index[MAX_CICP_CHANNELS] =
};
#ifdef NONBE_FIX_1165_STATIC_SCAL_PARAMMC
#define ivas_param_mc_dmx_scal_fac_CICP6_2tc_static     (2.0f + 2.f * INV_SQRT2)
#define ivas_param_mc_dmx_scal_fac_CICP6_2tc_static     4.f /* orig: (2.0f + 2.f * INV_SQRT2) */
#define ivas_param_mc_dmx_scal_fac_CICP6_2tc_static_inv (1.f / ivas_param_mc_dmx_scal_fac_CICP6_2tc_static)
#endif
@@ -1843,7 +1843,7 @@ const float ivas_param_mc_dmx_fac_CICP6_2tc[12] =
};
#ifdef NONBE_FIX_1165_STATIC_SCAL_PARAMMC
#define ivas_param_mc_dmx_scal_fac_CICP12_2tc_static     (3.0f + 2.f * INV_SQRT2)
#define ivas_param_mc_dmx_scal_fac_CICP12_2tc_static     4.f /* orig: (3.0f + 2.f * INV_SQRT2) */
#define ivas_param_mc_dmx_scal_fac_CICP12_2tc_static_inv (1.f / ivas_param_mc_dmx_scal_fac_CICP12_2tc_static)
#endif
@@ -1854,7 +1854,7 @@ const float ivas_param_mc_dmx_fac_CICP12_2tc[16] =
};
#ifdef NONBE_FIX_1165_STATIC_SCAL_PARAMMC
#define ivas_param_mc_dmx_scal_fac_CICP12_3tc_static     (3.0f)
#define ivas_param_mc_dmx_scal_fac_CICP12_3tc_static     4.f /* orig: (3.0f) */
#define ivas_param_mc_dmx_scal_fac_CICP12_3tc_static_inv (1.f / ivas_param_mc_dmx_scal_fac_CICP12_3tc_static)
#endif
@@ -1866,7 +1866,7 @@ const float ivas_param_mc_dmx_fac_CICP12_3tc[24] =
};
#ifdef NONBE_FIX_1165_STATIC_SCAL_PARAMMC
#define ivas_param_mc_dmx_scal_fac_CICP14_2tc_static     (3.0f + 2.f * INV_SQRT2)
#define ivas_param_mc_dmx_scal_fac_CICP14_2tc_static     4.f /* orig: (3.0f + 2.f * INV_SQRT2) */
#define ivas_param_mc_dmx_scal_fac_CICP14_2tc_static_inv (1.f / ivas_param_mc_dmx_scal_fac_CICP14_2tc_static)
#endif
@@ -1877,7 +1877,7 @@ const float ivas_param_mc_dmx_fac_CICP14_2tc[16] =
};
#ifdef NONBE_FIX_1165_STATIC_SCAL_PARAMMC
#define ivas_param_mc_dmx_scal_fac_CICP14_3tc_static     (3.0f)
#define ivas_param_mc_dmx_scal_fac_CICP14_3tc_static     4.f /* orig: (3.0f) */
#define ivas_param_mc_dmx_scal_fac_CICP14_3tc_static_inv (1.f / ivas_param_mc_dmx_scal_fac_CICP14_3tc_static)
#endif
@@ -1901,7 +1901,7 @@ const float ivas_param_mc_dmx_fac_CICP16_3tc[30] =
};
#ifdef NONBE_FIX_1165_STATIC_SCAL_PARAMMC
#define ivas_param_mc_dmx_scal_fac_CICP19_3tc_static     (5.0f)
#define ivas_param_mc_dmx_scal_fac_CICP19_3tc_static     4.f /* orig: (5.0f) */
#define ivas_param_mc_dmx_scal_fac_CICP19_3tc_static_inv (1.f / ivas_param_mc_dmx_scal_fac_CICP19_3tc_static)
#endif