Commit 488ff5d4 authored by multrus's avatar multrus
Browse files

Merge branch 'main' into basop-2561-review-code-in-stereo_dft_enc_compute_itd

parents 9906a4e5 0f592207

lib_com/common_api_types.h

+3 −1
Original line number Diff line number Diff line
@@ -163,9 +163,11 @@ typedef struct 


typedef struct

{



    float x, y, z;



#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

    Word32 x_fx, y_fx, z_fx; /* qfact, qfact, qfact */

    Word32 x_fx, y_fx, z_fx; /* q_fact, q_fact, q_fact */

#else

    Word32 x_fx, y_fx, z_fx;

#endif

lib_com/ivas_prot_fx.h

+1 −1
Original line number Diff line number Diff line
@@ -1939,7 +1939,7 @@ void TDREND_MIX_LIST_SetPos_fx( 
    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD renderer handle                          */

#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

    const Word32 *Pos_p,                                        /* i  : Listener's position                         */

    const Word16 Pos_q                                          /* i  : Listener's position Q value                 */

    const Word16 Pos_q                                          /* i  : Listener's position Q                       */

#else

    const Word32 *Pos_p                                         /* i  : Listener's position                         */

#endif

lib_com/options.h

+4 −1
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ 
#define FIX_BASOP_2555_FRAMELEN_CALC                    /* FhG: BASOP issue 2555: Simplify (sub-)framelength calculation in ivas_mdct_core_tns_ns_fx() */

#define FIX_BASOP_2095_REMOVE_TABLES_PT01               /* FhG: BASOP issue 2095: remove unused tables, part 01 */

#define FIX_2346_DUPLICATED_IGF_FUNCTIONS_2             /* FhG: part 2 of basop issue 2346: Review potentially duplicated IGF functions */

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



/* #################### End BE switches ################################## */
@@ -115,6 +117,7 @@ 


#define FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API            /* Expose Payload Type setting in RTP Header */

#define FIX_BASOP_2023_TDREND_DISTATT_PRECISION         /* Eri: Basop issue 2023: Distance attenuation scaling, adding clamping of distance att input and listener position */

#define FIX_BASOP_2023_TDREND_DISTATT_PRECISION_BUGFIX  /* Eri: Bug discovered in cleanup of basop issue 2023 */

#define USE_RTPDUMP                                     /* FhG: RTPDUMP format (rtptools standard) instead of custom format */

#define FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS        /* Nokia: float issue 1569: fix render config checks in renderer */

#define FIX_BASOP_2526_SPAR_MASA_PARAM_MAP_Q_BUG        /* Nokia: BASOP issue 2526: Fix wrong Q variable in SPAR to MASA param mapping */

lib_dec/ivas_rom_dec.h

+2 −0
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ 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

+6 −2
Original line number Diff line number Diff line
@@ -476,6 +476,7 @@ 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] = 

{
@@ -544,6 +545,7 @@ static const Word16 huff_nodes_alpha_1D_DT[64][2] = 
    { -3, -64 },

    { -2, -63 }

};

#endif



/* Beta Fine Huffman table df0 */

static const Word16 huff_nodes_first_band_beta[8][2] =
@@ -557,12 +559,13 @@ 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 =

{
@@ -576,11 +579,12 @@ 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 */