Commit cd7b676e authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept FIX_2095_REMOVE_UNUSED_ISAR_TABLES

parent efb90fa1

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ 
#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_MSVQ_Interpol_Tran_fx /* FhG: Fix saturation crash in MSVQ_Interpol_Tran_fx() */

#define NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT_FIX_2527    /* Fix crash from issue #2527 */

#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* VA/Nokia: reintroduce format switching for g192 bitstreams */

#define FIX_2095_REMOVE_UNUSED_ISAR_TABLES              /* Dolby: remove unused ISAR */

#define FIX_BASOP_2560_STEREO_DFT_DEC_RESET             /* FhG: BASOP issue 2560: align reset of hStereoDft->res_gains_ind_fx[][] between BASOP and float */

#define HARMONIZE_2539_cng_energy                       /* FhG: basop issue 2539: harmonize cng_energy with its ivas derivate */

#define FIX_1585_ASAN_FORMAT_SW_ALT                     /* VA,FhG: float issues 1585,1593: alternative fix memory leaks with format switching */

lib_dec/ivas_rom_dec.h

+0 −3
Original line number Diff line number Diff line
@@ -96,8 +96,5 @@ extern const Word16 dirac_dithering_ele_scale_fx[DIRAC_DIFFUSE_LEVELS]; 


extern const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df0;

extern const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df;

#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES

extern const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_dt;

#endif



#endif /* IVAS_ROM_DEC_H */

lib_dec/ivas_rom_dec_fx.c

+0 −84
Original line number Diff line number Diff line
@@ -476,76 +476,6 @@ static const Word16 huff_nodes_alpha_1D_DF[64][2] = 
    { -2, -62 }

};



#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES

/* Alpha Fine Huffman table dt */

static const Word16 huff_nodes_alpha_1D_DT[64][2] = 

{

    { -33, 1 },

    { -34, 2 },

    { -32, 3 },

    { 5, 4 },

    { -31, -35 },

    { 7, 6 },

    { -36, 8 },

    { -30, 9 },

    { 11, 10 },

    { -29, -37 },

    { 13, 12 },

    { 15, 14 },

    { -28, -38 },

    { 17, 16 },

    { -27, -39 },

    { 19, 18 },

    { -40, 20 },

    { -26, 21 },

    { 23, 22 },

    { -25, -41 },

    { 25, 24 },

    { -24, -42 },

    { 27, 26 },

    { -23, -43 },

    { 29, 28 },

    { -22, -44 },

    { 31, 30 },

    { -45, 32 },

    { -21, 33 },

    { -20, 34 },

    { -46, 35 },

    { -47, 36 },

    { -19, 37 },

    { -48, 38 },

    { -18, 39 },

    { 41, 40 },

    { -17, -49 },

    { 43, 42 },

    { -50, 44 },

    { -16, 45 },

    { 47, 46 },

    { -51, 48 },

    { -15, 49 },

    { 51, 50 },

    { -52, -65 },

    { -1, -14 },

    { 53, 52 },

    { -53, 54 },

    { -13, 55 },

    { 57, 56 },

    { -12, 58 },

    { -54, 59 },

    { 61, 60 },

    { -11, -55 },

    { -56, 62 },

    { -10, 63 },

    { -9, -57 },

    { -5, -6 },

    { -58, -61 },

    { -7, -59 },

    { -8, -62 },

    { -4, -60 },

    { -3, -64 },

    { -2, -63 }

};

#endif



/* Beta Fine Huffman table df0 */

static const Word16 huff_nodes_first_band_beta[8][2] =
@@ -559,13 +489,6 @@ static const Word16 huff_nodes_beta_1D_DF[16][2] = 
    { -9, 1 }, { -10, 2 }, { -8, 3 }, { -11, 4 }, { -7, 5 }, { 7, 6 }, { -6, -12 }, { 9, 8 }, { -5, -13 }, { 11, 10 }, { -4, -14 }, { -15, 12 }, { -3, 13 }, { -16, 14 }, { -2, 15 }, { -1, -17 } 

};



#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES

/* Beta Fine Huffman table dt */

static const Word16 huff_nodes_beta_1D_DT[16][2] =

{ 

    { -9, 1 }, { -10, 2 }, { -8, 3 }, { -11, 4 }, { -7, 5 }, { 7, 6 }, { -6, -12 }, { -13, 8 }, { -5, 9 }, { -14, 10 }, { -4, 11 }, { -15, 12 }, { -3, 13 }, { -16, 14 }, { -2, 15 }, { -1, -17 } 

};

#endif



const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df0 =

{
@@ -579,12 +502,5 @@ const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df = 
    huff_nodes_beta_1D_DF

};



#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES

const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_dt =

{

    huff_nodes_alpha_1D_DT,

    huff_nodes_beta_1D_DT

};

#endif



/* clang-format on */

lib_isar/isar_rom_lcld_tables.c

+133 −1315
Original line number Diff line number Diff line
@@ -294,42 +294,6 @@ const Word32 c_aiQuantMaxValues_fx[ALLOC_TABLE_SIZE] = { 
    377487360,

};



#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES

const Word32 c_aiQuantMaxValues[ALLOC_TABLE_SIZE] = {

    0,

    3,

    3,

    4,

    5,

    5,

    6,

    7,

    8,

    9,

    12,

    13,

    16,

    17,

    19,

    23,

    26,

    26,

    27,

    28,

    31,

    36,

    38,

    45,

    54,

    64,

    76,

    90,

    108,

    128,

    152,

    180,

};

#endif



const Word32 c_aiHuffmanDim_fx[ALLOC_TABLE_SIZE] = {

    2,
@@ -471,42 +435,6 @@ const Word32 c_aiHuffmanMod[ALLOC_TABLE_SIZE] = { 
    1,

};



#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES

const Word32 c_aiHuffmanSize[ALLOC_TABLE_SIZE] = {

    1,

    16,

    16,

    25,

    36,

    36,

    49,

    64,

    81,

    100,

    169,

    196,

    289,

    324,

    400,

    576,

    729,

    729,

    28,

    29,

    32,

    37,

    39,

    46,

    55,

    65,

    77,

    91,

    109,

    129,

    153,

    181,

};

#endif



const UWord32 c_aaiRMSEnvHuffEnc[64][2] = {

    { 0x0014, 0x0000 },
@@ -19213,1246 +19141,142 @@ const Word16 c_aiLogAddTable_fx[LOG_ADD_TABLE_LENGTH] = { 
    0x00,

};



#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES

const Word32 c_aiLogAddTable[LOG_ADD_TABLE_LENGTH] = {

    0x40,

    0x40,

    0x3F,

    0x3F,

    0x3E,

    0x3E,

    0x3D,

    0x3D,

    0x3C,

    0x3C,

    0x3B,

    0x3B,

    0x3A,

    0x3A,

    0x39,

    0x39,

    0x38,

    0x38,

    0x37,

    0x37,

    0x37,

    0x36,

    0x36,

    0x35,

    0x35,

    0x34,

    0x34,

    0x33,

    0x33,

    0x33,

    0x32,

    0x32,

    0x31,

    0x31,

    0x31,

    0x30,

    0x30,

    0x2F,

    0x2F,

    0x2F,

    0x2E,

    0x2E,

    0x2D,

    0x2D,

    0x2D,

    0x2C,

    0x2C,

    0x2B,

    0x2B,

    0x2B,

    0x2A,

    0x2A,

    0x2A,

    0x29,

    0x29,

    0x29,

    0x28,

    0x28,

    0x27,

    0x27,

    0x27,

    0x26,

    0x26,

    0x26,

    0x25,

    0x25,

    0x25,

    0x24,

    0x24,

    0x24,

    0x23,

    0x23,

    0x23,

    0x23,

    0x22,

    0x22,

    0x22,

    0x21,

    0x21,

    0x21,

    0x20,

    0x20,

    0x20,

    0x20,

    0x1F,

    0x1F,

    0x1F,

    0x1E,

    0x1E,

    0x1E,

    0x1E,

    0x1D,

    0x1D,

    0x1D,

    0x1C,

    0x1C,

    0x1C,

    0x1C,

    0x1B,

    0x1B,

    0x1B,

    0x1B,

    0x1A,

    0x1A,

    0x1A,

    0x1A,

    0x19,

    0x19,

    0x19,

    0x19,

    0x18,

    0x18,

    0x18,

    0x18,

    0x18,

    0x17,

    0x17,

    0x17,

    0x17,

    0x16,

    0x16,

    0x16,

    0x16,

    0x16,

    0x15,

    0x15,

    0x15,

    0x15,

    0x15,

    0x14,

    0x14,

    0x14,

    0x14,

    0x14,

    0x13,

    0x13,

    0x13,

    0x13,

    0x13,

    0x13,

    0x12,

    0x12,

    0x12,

    0x12,

    0x12,

    0x11,

    0x11,

    0x11,

    0x11,

    0x11,

    0x11,

    0x10,

    0x10,

    0x10,

    0x10,

    0x10,

    0x10,

    0x0F,

    0x0F,

    0x0F,

    0x0F,

    0x0F,

    0x0F,

    0x0F,

    0x0E,

    0x0E,

    0x0E,

    0x0E,

    0x0E,

    0x0E,

    0x0E,

    0x0D,

    0x0D,

    0x0D,

    0x0D,

    0x0D,

    0x0D,

    0x0D,

    0x0D,

    0x0C,

    0x0C,

    0x0C,

    0x0C,

    0x0C,

    0x0C,

    0x0C,

    0x0C,

    0x0B,

    0x0B,

    0x0B,

    0x0B,

    0x0B,

    0x0B,

    0x0B,

    0x0B,

    0x0B,

    0x0A,

    0x0A,

    0x0A,

    0x0A,

    0x0A,

    0x0A,

    0x0A,

    0x0A,

    0x0A,

    0x0A,

    0x09,

    0x09,

    0x09,

    0x09,

    0x09,

    0x09,

    0x09,

    0x09,

    0x09,

    0x09,

    0x08,

    0x08,

    0x08,

    0x08,

    0x08,

    0x08,

    0x08,

    0x08,

    0x08,

    0x08,

    0x08,

    0x08,

    0x08,

    0x07,

    0x07,

    0x07,

    0x07,

    0x07,

    0x07,

    0x07,

    0x07,

    0x07,

    0x07,

    0x07,

    0x07,

    0x07,

    0x06,

    0x06,

    0x06,

    0x06,

    0x06,

    0x06,

    0x06,

    0x06,

    0x06,

    0x06,

    0x06,

    0x06,

    0x06,

    0x06,

    0x06,

    0x06,

    0x05,

    0x05,

    0x05,

    0x05,

    0x05,

    0x05,

    0x05,

    0x05,

    0x05,

    0x05,

    0x05,

    0x05,

    0x05,

    0x05,

    0x05,

    0x05,

    0x05,

    0x05,

    0x05,

    0x04,

    0x04,

    0x04,

    0x04,

    0x04,

    0x04,

    0x04,

    0x04,

    0x04,

    0x04,

    0x04,

    0x04,

    0x04,

    0x04,

    0x04,

    0x04,

    0x04,

    0x04,

    0x04,

    0x04,

    0x04,

    0x04,

    0x04,

    0x04,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x03,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x02,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x01,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

    0x00,

};

#endif



const Word16 c_aiBandwidthAdjust48_fx[MAX_BANDS_48] = {

    0,

    0,

    0,

    0,

    0,

    0,

    0,

    0,

    0,

    0,

    0,

    64,

    64,

    64,

    64,

    64,

    101,

    101,

    128,

    165,

    165,

    180,

    213,

};



#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES

const Word32 c_aiBandwidthAdjust48[MAX_BANDS_48] = {



    0,

    0,

    0,

    0,

    0,

    0,

    0,

    0,

    0,

    0,

    0,

    64,

    64,

    64,

    64,

    64,

    101,

    101,

    128,

    165,

    165,

    180,

    213,

};

#endif



const Word16 c_aiAbsoluteThresh48_fx[MAX_BANDS_48] = {

    -1787,

    -1787,

    -1787,

    -1787,

    -1787,

    -1787,

    -1787,

    -1787,

    -1782,

    -1761,

    -1737,

    -1679,

    -1638,

    -1613,

    -1590,

    -1568,

    -1516,

    -1459,

    -1395,

    -1289,

    -671,

    -409,

    -401,

};



#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES

const Word32 c_aiAbsoluteThresh48[MAX_BANDS_48] = {

    -1787,

    -1787,

    -1787,

    -1787,

    -1787,

    -1787,

    -1787,

    -1787,

    -1782,

    -1761,

    -1737,

    -1679,

    -1638,

    -1613,

    -1590,

    -1568,

    -1516,

    -1459,

    -1395,

    -1289,

    -671,

    -409,

    -401,

};

#endif



#if PERCEPTUAL_MODEL_SLGAIN_SHIFT == 4

const Word32 c_aiDefaultTheta48[MAX_BANDS_48] = {

    7,

    7,

    6,

    5,

    5,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

};

#elif PERCEPTUAL_MODEL_SLGAIN_SHIFT == 8

const Word16 c_aiDefaultTheta48_fx[MAX_BANDS_48] = {



    112,

    112,

    96,

    80,

    80,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

};

#endif

const Word32 c_aiDefaultTheta48[MAX_BANDS_48] = {



    112,

    112,

    96,

    80,

    80,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

};

const Word16 c_aaiSpreadFunction48_fx[MAX_BANDS_48 * MAX_BANDS_48] = {

    0,

    -1561,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -289,

    -4,

    -1234,

    -2295,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -569,

    -229,

    -8,

    -905,

    -1705,

    -2324,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -789,

    -445,

    -173,

    -16,

    -656,

    -1271,

    -1765,

    -2172,

    -2520,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -961,

    -616,

    -340,

    -136,

    -28,

    -488,

    -976,

    -1382,

    -1729,

    -2032,

    -2305,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -1088,

    -743,

    -465,

    -257,

    -148,

    -31,

    -371,

    -769,

    -1114,

    -1417,

    -1689,

    -2054,

    -2483,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -1198,

    -852,

    -574,

    -364,

    -209,

    -148,

    -42,

    -300,

    -635,

    -936,

    -1207,

    -1572,

    -2000,

    -2376,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -1293,

    -948,

    -669,

    -458,

    -301,

    -183,

    -145,

    -56,

    -258,

    -547,

    -816,

    -1179,

    -1606,

    -1982,

    -2311,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -1375,

    -1029,

    -750,

    -539,

    -381,

    -260,

    -180,

    -142,

    -68,

    -231,

    -487,

    -846,

    -1272,

    -1647,

    -1976,

    -2261,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -1444,

    -1099,

    -820,

    -608,

    -449,

    -328,

    -233,

    -194,

    -138,

    -77,

    -213,

    -555,

    -978,

    -1352,

    -1681,

    -1966,

    -2268,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -2552,

    -1501,

    -1155,

    -876,

    -665,

    -505,

    -383,

    -287,

    -210,

    -193,

    -130,

    -79,

    -298,

    -711,

    -1083,

    -1411,

    -1696,

    -1997,

    -2288,

    -2550,

    -2552,

    -2552,

    -2552,

    -2552,

    -1567,

    -1221,

    -942,

    -730,

    -570,

    -448,

    -351,

    -272,

    -206,

    -189,

    -151,

    -72,

    -349,

    -713,

    -1039,

    -1324,

    -1625,

    -1915,

    -2177,

    -2448,

    -2552,

    -2552,

    -2552,

    -1650,

    -1304,

    -1025,

    -813,

    -653,

    -530,

    -432,

    -352,

    -285,

    -227,

    -177,

    -163,

    -69,

    -297,

    -613,

    -895,

    -1195,

    -1485,

    -1746,

    -2017,

    -2238,

    -2401,

    -2545,

    -1727,

    -1381,

    -1102,

    -890,

    -730,

    -607,

    -509,

    -428,

    -360,

    -301,

    -249,

    -180,

    -153,

    -72,

    -257,

    -527,

    -824,

    -1112,

    -1373,

    -1643,

    -1865,

    -2028,

    -2171,

    -1798,

    -1452,

    -1173,

    -960,

    -800,

    -677,

    -579,

    -498,

    -430,

    -370,

    -317,

    -246,

    -192,

    -145,

    -76,

    -224,

    -505,

    -790,

    -1050,

    -1320,

    -1540,

    -1703,

    -1847,

    -1860,

    -1514,

    -1234,

    -1022,

    -862,

    -738,

    -640,

    -559,

    -490,

    -430,

    -377,

    -306,

    -224,

    -197,

    -136,

    -81,

    -242,

    -515,

    -771,

    -1040,

    -1260,

    -1422,

    -1566,

    -1923,

    -1577,

    -1297,

    -1085,

    -925,

    -801,

    -703,

    -621,

    -553,

    -492,

    -439,

    -367,

    -284,

    -213,

    -198,

    -144,

    -83,

    -235,

    -479,

    -744,

    -963,

    -1125,

    -1268,

    -1986,

    -1640,

    -1360,

    -1148,

    -988,

    -864,

    -766,

    -684,

    -615,

    -555,

    -501,

    -429,

    -345,

    -273,

    -211,

    -204,

    -146,

    -89,

    -216,

    -465,

    -680,

    -841,

    -984,

    -2043,

    -1697,

    -1417,

    -1205,

    -1044,

    -921,

    -822,

    -741,

    -672,

    -611,

    -557,

    -485,



const Word16 c_aiBandwidthAdjust48_fx[MAX_BANDS_48] = {

    0,

    0,

    0,

    0,

    0,

    0,

    0,

    0,

    0,

    0,

    0,

    64,

    64,

    64,

    64,

    64,

    101,

    101,

    128,

    165,

    165,

    180,

    213,

};





const Word16 c_aiAbsoluteThresh48_fx[MAX_BANDS_48] = {

    -1787,

    -1787,

    -1787,

    -1787,

    -1787,

    -1787,

    -1787,

    -1787,

    -1782,

    -1761,

    -1737,

    -1679,

    -1638,

    -1613,

    -1590,

    -1568,

    -1516,

    -1459,

    -1395,

    -1289,

    -671,

    -409,

    -401,

    -328,

    -264,

    -211,

    -205,

    -140,

    -93,

    -227,

    -430,

    -588,

    -729,

    -2104,

    -1758,

    -1479,

    -1266,

    -1106,

    -982,

    -884,

    -802,

    -733,

    -673,

    -619,

    -546,

    -461,

    -388,

    -324,

    -269,

    -212,

    -211,

    -151,

    -100,

    -195,

    -336,

    -472,

    -2163,

    -1817,

    -1537,

    -1324,

    -1164,

    -1040,

    -942,

    -860,

    -791,

    -731,

    -676,

    -604,

    -519,

    -445,

    -380,

    -325,

    -268,

    -226,

    -219,

    -147,

    -114,

    -167,

    -280,

    -2203,

    -1857,

    -1577,

    -1365,

    -1205,

    -1081,

    -982,

    -901,

    -831,

    -771,

    -717,

    -644,

    -559,

    -485,

    -420,

    -364,

    -306,

    -252,

    -239,

    -206,

    -132,

    -122,

    -163,

    -2224,

    -1878,

    -1598,

    -1386,

    -1225,

    -1102,

    -1003,

    -921,

    -852,

    -792,

    -737,

    -665,

    -580,

    -505,

    -441,

    -385,

    -326,

    -271,

    -222,

    -224,

    -176,

    -121,

    -114,

};



#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES

const Word32 c_aaiSpreadFunction48[MAX_BANDS_48 * MAX_BANDS_48] = {



#if PERCEPTUAL_MODEL_SLGAIN_SHIFT == 4

const Word32 c_aiDefaultTheta48[MAX_BANDS_48] = {

    7,

    7,

    6,

    5,

    5,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

    4,

};

#elif PERCEPTUAL_MODEL_SLGAIN_SHIFT == 8

const Word16 c_aiDefaultTheta48_fx[MAX_BANDS_48] = {



    112,

    112,

    96,

    80,

    80,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

};

#endif

const Word32 c_aiDefaultTheta48[MAX_BANDS_48] = {



    112,

    112,

    96,

    80,

    80,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

    64,

};

const Word16 c_aaiSpreadFunction48_fx[MAX_BANDS_48 * MAX_BANDS_48] = {

    0,

    -1561,

    -2552,
@@ -20984,7 +19808,6 @@ const Word32 c_aaiSpreadFunction48[MAX_BANDS_48 * MAX_BANDS_48] = { 
    -114,

};



#endif



const Word32 c_pfMagLUT[8] = /* Q31 */ {

    0, 394599072, 775760576, 1130504448, 1446750336, 1713728896, 1922348544, 2065504896
@@ -21008,8 +19831,3 @@ const Word32 c_pfP2RImagLUT[32] = /* Q31 */ { 
    821806080, 418953248

};

#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES

const Word32 c_pfWindowLUT[LCLD_PRED_WIN_LEN] = /* Q31 */ {

    190779840, 338280192, 610825408, 966922816, 1352359680, 1708457216, 1981002240, 2128502656, 2128502528, 1981002240, 1708456960, 1352359808, 966922624, 610825152, 338280192, 190779776

};

#endif

lib_isar/isar_rom_lcld_tables.h

+0 −11
Original line number Diff line number Diff line
@@ -130,14 +130,6 @@ extern const Word16 c_aiDefaultTheta48_fx[MAX_BANDS_48]; 
extern const Word16 c_aaiSpreadFunction48_fx[MAX_BANDS_48 * MAX_BANDS_48];

extern const Word32 c_aiDefaultTheta48[MAX_BANDS_48];



#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES

extern const Word32 c_aiQuantMaxValues[ALLOC_TABLE_SIZE];

extern const Word32 c_aiLogAddTable[LOG_ADD_TABLE_LENGTH];

extern const Word32 c_aiHuffmanSize[ALLOC_TABLE_SIZE];

extern const Word32 c_aiBandwidthAdjust48[MAX_BANDS_48];

extern const Word32 c_aiAbsoluteThresh48[MAX_BANDS_48];

extern const Word32 c_aaiSpreadFunction48[MAX_BANDS_48 * MAX_BANDS_48];

#endif



#define PRED_QUNAT_FILTER_MAG_BITS   ( 3 )

#define PRED_QUANT_FILTER_PHASE_BITS ( 5 )
@@ -238,8 +230,5 @@ extern const UWord32 c_aaiRMSEnvHuffDec[13][HUFF_DEC_TABLE_SIZE]; 
extern const Word32 c_pfMagLUT[8];      /* Q31 */

extern const Word32 c_pfP2RRealLUT[32]; /* Q31 */

extern const Word32 c_pfP2RImagLUT[32]; /* Q31 */

#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES

extern const Word32 c_pfWindowLUT[LCLD_PRED_WIN_LEN]; /* Q31 */

#endif



#endif /* ISAR_ROM_LCLD_TABLES_H_ */