Commit 7b060915 authored by multrus's avatar multrus
Browse files

port flp MR 1724

parent cdeff434

lib_com/ivas_rom_com.c

+2 −1
Original line number Diff line number Diff line
@@ -1737,6 +1737,7 @@ 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*/
@@ -1744,7 +1745,7 @@ const Word32 ivas_param_mc_dmx_fac_CICP19_4tc_fx[48] = 
    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] =

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ 
#define FIX_1222_OMASA_DEC_CHANNEL_BUFFERS              /* VA: issue 1222: Reduction of the number of channel buffers in OMASA decoder */

#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 FIX_1111_TDM_LSP_BUFFER                         /* VA: issue 1111: remove unused buffer `tdm_lspQ_PCh[]' */

#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  */