Commit 5d5330a5 authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept FIX_2095_REMOVE_UNUSED_ISAR_TABLES

parent 1f2d6a84

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ 
#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

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

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

#define FIX_FLOAT_1582_STEREO_DFT_QUANTIZE_ITD          /* FhG: float issue 1582: Remove unncessary statement from stereo_dft_quantize_itd() */

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

#define FIX_2570_BUF_OVFL                               /* Orange: basop issue 2570: global-buffer-overflow in lib_rend/ivas_objectRenderer_sources_fx.c */

lib_dec/ivas_rom_dec.c

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

};



#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES

/* Alpha Fine Huffman table dt */

static const int16_t 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 int16_t huff_nodes_first_band_beta[8][2] =
@@ -583,13 +513,6 @@ static const int16_t 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 int16_t 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 =

{
@@ -603,12 +526,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 */