Commit 3288f81e authored by vaillancour's avatar vaillancour
Browse files

update lib_com

parent 78d41607

lib_com/cnst_fx.h

+3 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#define MAX_FRAME_COUNTER                     200

#define BITS_PER_SHORT                        16

#define BITS_PER_BYTE                         8

#define MAX_BITS_PER_FRAME                    2560

#define MAX_BITS_PER_FRAME                    10240 /* Bits per frame for max. bitrate 512kbps, == IVAS_MAX_BITS_PER_FRAME */ 

#define SYNC_GOOD_FRAME                       (UWord16) 0x6B21         /* synchronization word of a "good" frame */

#define SYNC_BAD_FRAME                        (UWord16) 0x6B20         /* synchronization word of a "bad" frame */

#define G192_BIN0                             (UWord16) 0x007F         /* binary "0" according to ITU-T G.192 */
@@ -539,8 +539,8 @@ enum 
#define L_FILT_MAX                            L_FILT48k /* Resampling - maximum length of all filters - for memories */

#define RS_INV_FAC                            0x8000    /* Resampling - flag needed in rom_com and modif_fs to allow pre-scaled and non pre-scaled filters */



#define CLDFB_NO_CHANNELS_MAX                 60        /* CLDFB resampling - max number of CLDFB channels */

#define CLDFB_NO_COL_MAX                      16        /* CLDFB resampling - max number of CLDFB col. */

#define CLDFB_NO_CHANNELS_MAX                 60        /* CLDFB resampling - max number of CLDFB channels, == IVAS_CLDFB_NO_CHANNELS_MAX */ 

#define CLDFB_NO_COL_MAX                      16        /* CLDFB resampling - max number of CLDFB col., == IVAS_CLDFB_NO_COL_MAX */ 

#define CLDFB_NO_COL_MAX_SWITCH               6         /* CLDFB resampling - max number of CLDFB col. for switching */

#define CLDFB_NO_COL_MAX_SWITCH_BFI           8         /* CLDFB resampling - max number of CLDFB col. for switching */

lib_com/delay_comp.c

+1 −2
Original line number Diff line number Diff line
@@ -70,8 +70,7 @@ Word32 get_delay_fx( /* o : delay value in ms 
            delay = IVAS_DEC_DELAY_NS;



#ifdef SPLIT_REND_WITH_HEAD_ROT



            IF (NE_16(output_config, AUDIO_CONFIG_BINAURAL_SPLIT_CODED))

            IF (NE_16(output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED))

            {

#endif

                IF (hCldfb != NULL)

lib_com/index_pvq_opt_fx.c

+4 −5
Original line number Diff line number Diff line
@@ -852,7 +852,7 @@ void mpvq_decode_vec_fx( /* o : void */ 
)

{

    Word16 i, leading_sign;

    IND2VECFUNCM  mind2vec_f_fx[N_OPT_FX+1] = { (IND2VECFUNCM)NULL, mind2vec_one_fx, mind2vec_two_fx, mind2vec_three_fx, mind2vec_four_fx, mind2vec_five_fx };

    const IND2VECFUNCM  mind2vec_f_fx[N_OPT_FX+1] = { (IND2VECFUNCM)NULL, mind2vec_one_fx, mind2vec_two_fx, mind2vec_three_fx, mind2vec_four_fx, mind2vec_five_fx };



    FOR(i=0; i<entry->dim; i++)

    {
@@ -1155,11 +1155,10 @@ PvqEntry_fx mpvq_encode_vec_fx( /* o : leading_sign_ind 
)

{

    PvqEntry_fx result;

    UWord32 h_mem[ 1 + KMAX_NON_DIRECT_FX + 1 ] ;   /* now always assign max offset buffer for dim 6 ,

                                                       actually only 1+k_val_in+1 needed ) */

    UWord32 h_mem[ 1 + KMAX_NON_DIRECT_FX + 1 ] ;   /* now always assign max offset buffer for dim 6 , actually only 1+k_val_in+1 needed ) */

    UWord32 lead_sign_ind;



    VEC2INDFUNCM  vec2mind_f[1+N_OPT_FX] = { (VEC2INDFUNCM)NULL, vec2mind_one_fx, vec2mind_two_fx, vec2mind_three_fx, vec2mind_four_fx, vec2mind_five_fx };

    const VEC2INDFUNCM  vec2mind_f[1+N_OPT_FX] = { (VEC2INDFUNCM)NULL, vec2mind_one_fx, vec2mind_two_fx, vec2mind_three_fx, vec2mind_four_fx, vec2mind_five_fx };



    result.k_val =  k_val_local;

    move16();

lib_com/ppp_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ void deemph_lpc_fx( 
{

    Word16 k,temp;

    Word16 b_fx[M+2];/* Q12 */

    Word16 a_fx[2] = {-22282, 32767};/* Q15 {-PREEMPH_FAC,1.0} */

    const Word16 a_fx[2] = {-22282, 32767};/* Q15 {-PREEMPH_FAC,1.0} */

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

#endif

lib_com/swb_tbe_com_fx.c

+5 −4
Original line number Diff line number Diff line
@@ -1442,11 +1442,12 @@ void GenShapedSHBExcitation_fx( 
    Word16 mix_factor, old_fact, new_fact, fact, old_scale, new_scale, step_scale;

    Word16 c0, c1, c2, c3, c4, c5, g1, g2, g, den;

    Word16 EnvWhiteExc16k[L_FRAME16k], EnvExc16kWhtnd[L_FRAME16k];

    Word16 EnvWhiteExc16k_4k[L_FRAME4k] = { 0 }, EnvExc16kWhtnd_4k[L_FRAME4k] = { 0 };

    Word16 EnvWhiteExc16k_4k[L_FRAME4k] , EnvExc16kWhtnd_4k[L_FRAME4k] ;

    Word16 flag_plosive;

    Word16 delta;

    Word16 c0_part[NUM_SHB_SUBGAINS], c1_part[NUM_SHB_SUBGAINS], c2_part[NUM_SHB_SUBGAINS], c3_part[NUM_SHB_SUBGAINS], c4_part[NUM_SHB_SUBGAINS], c5_part[NUM_SHB_SUBGAINS];



    set_f(EnvWhiteExc16k_4k, 0, L_FRAME4k);

    set_f(EnvExc16kWhtnd_4k, 0, L_FRAME4k);

    mix_factor = 0.0f;

#endif

    set16_fx( zero_mem, 0, LPC_SHB_ORDER );
@@ -3128,8 +3129,8 @@ void interp_code_5over2_fx( 
{

    Word16 i, kk, kkp1, i_len2;

    Word32 Ltemp;

    Word16 factor_i_fx[5]   = {6554, 19661, 32767, 19661, 6554};

    Word16 factor_j_fx[5]   = {26214, 13107, 0, 13107, 26214};

    const Word16 factor_i_fx[5]   = {6554, 19661, 32767, 19661, 6554};

    const Word16 factor_j_fx[5]   = {26214, 13107, 0, 13107, 26214};



    interp_code_fx[0] = inp_code_fx[0];

    move16();/* Qx */