Commit fdaec8e5 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1157_OBSOLETE_DMX_TABLE

parent 25027747
Loading
Loading
Loading
Loading
+0 −9
Original line number Diff line number Diff line
@@ -1737,15 +1737,6 @@ const Word32 ivas_param_mc_dmx_fac_CICP19_3tc_fx[36] =
    0,0,2147483647,2147483647,0,0,0,0,0,0,0,0 /*Ct*/
};

#ifndef FIX_1157_OBSOLETE_DMX_TABLE
const Word32 ivas_param_mc_dmx_fac_CICP19_4tc_fx[48] =
{
    2147483647,0,1518500224,1518500224,2147483647,0,2147483647,0,0,0,0,0, /*Lht*/
    0,2147483647,1518500224,1518500224,0,2147483647,0,2147483647,0,0,0,0, /*Rht*/
    0,0,0,0,0,0,0,0,2147483647,0,2147483647,0, /*Lut*/
    0,0,0,0,0,0,0,0,0,2147483647,0,2147483647 /*Rut*/
};
#endif

//Q15
const Word16 ivas_param_mc_ild_fac_CICP6_2tc_fx[6] =
+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@

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

#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_1329_FIX_OSBA_CRASH                       /* FhG: issue 1329: prevent assert when bit budget is low*/
#define NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER            /* FhG: issue 1128: set output ambisonics order to input order for EXT output  */