Commit 3ad1f6b2 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch 'isar_selection_branch' of... 

Merge branch 'isar_selection_branch' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into isar_selection_branch
parents df149924 b963c8c2

lib_isar/isar_splitRendererPre.c

+0 −1
Original line number Diff line number Diff line
@@ -1979,7 +1979,6 @@ void lc3plusTimeAlignCldfbPoseCorr( 
            }



            /* Delay existing columns by 2 slots */

            /*TODO : shouldnt the delay be 7.5 ms ?  5ms + LC3plus delay */

            for ( slot_idx = CLDFB_NO_COL_MAX - 2 - 1; slot_idx >= 0; --slot_idx )

            {

                mvr2r( Cldfb_In_BinReal[pose * BINAURAL_CHANNELS + ch][slot_idx], Cldfb_In_BinReal[pose * BINAURAL_CHANNELS + ch][slot_idx + 2], CLDFB_NO_CHANNELS_MAX );

lib_lc3plus/constants.c

+0 −11
Original line number Diff line number Diff line
@@ -5726,12 +5726,6 @@ const LC3_INT32 gwlpr[MAX_LGW+1] = { 1, 3*QUOT_LPR_LTR, 5*QUOT_LPR_LTR, 9*QUOT_L 
#ifdef  CR8_A_PLC_FADEOUT_TUNING 

/* PLC_FADEOUT_TUNING,  extended table ranging from 30 ms to 140 ms */

const LC3_INT16 fade_scheme_tab[24 / 2][3] = {

#if 0

    /* burst_att_thresh indicates when muting POW_ATT_TABLE[att_per_frame_idx] should be used  first time it is 1.0 though */

    /* burst_att_thresh ==2  -->    gains   [ 1.0, 32767/32768.0(first table value used) , first muted, ....              ]*/

    /* burst_att_thresh ==5  -->    gains  [ 1.0, 1.0, 1,0 1,0,  32767/32768.0(first table value used) , first muted,...  ]*/

    /* beta_mute_thr    ==4     -->  start of final attenuation attenuate  AvgMix  */

#endif 

    /* tabled {att_per_frame_idx_p3dB , burst_att_thresh,  beta_mute_thr } */

    {  1, 2, 0 + 2 + 2 },  /* 30 ms, 0.3 dB delta att in slow mutephase    nominal_fadeout=0 */

    {  1, 3, 0 + 3 + 2 },  /* 40 ms, 0.3 dB delta att in slow mutephase  */
@@ -5747,11 +5741,6 @@ const LC3_INT16 fade_scheme_tab[24 / 2][3] = { 
    { 11, 6, 15 + 6 },/* 140 ms, 0.3 dB delta att in slow mutephase  nominal 3GPP */















};













#if 0













/*fade_scheme_tab[ind][0] att_per _fram_index  , "points" to first column in POW_ATT TABLES */













/*fade_scheme_tab[ind][1] is burst_att_thresh,  the number of non_muted 1.0 gain  frames */













/*fade_scheme_tab[ind][2] is beta_mute_thr,      the location of the start of final muting   */













#endif



































































lib_lc3plus/defines.h



+0
−3




























Original line number
Diff line number
Diff line








@@ -171,9 +171,6 @@ typedef int32_t  LC3_INT32;





























/* current active settings */















#  define PLC2_FADEOUT_IN_MS        30         /* 30   P800 fadeout optimized  */













#if 0













#  define PLC2_FADEOUT_LONG_IN_MS   50        /*  50 ABBA test  */













#endif 















#  define PLC2_FADEOUT_LONG_IN_MS   120        /* 120  MUSHRA,  && stable tonal  fadeout optimized  */































#endif 

































lib_lc3plus/plc_phecu_subst_spec.c



+0
−9




























Original line number
Diff line number
Diff line








@@ -101,9 +101,6 @@ void plc_phEcu_subst_spec(LC3_INT32* plocs, LC3_INT32 n_plocs, LC3_FLOAT* f0est,













    }































#ifdef CR8_A_PLC_FADEOUT_TUNING













#if 0













    /* align DC fs/2 muting to BASOP */













#endif 















    /*  binary selection of fadeout scheme  */   















    assert(PLC2_FADEOUT_LONG_IN_MS >= PLC2_FADEOUT_IN_MS_MIN && PLC2_FADEOUT_IN_MS >= PLC2_FADEOUT_IN_MS_MIN);















    assert(PLC2_FADEOUT_LONG_IN_MS <= PLC2_FADEOUT_IN_MS_MAX && PLC2_FADEOUT_IN_MS <= PLC2_FADEOUT_IN_MS_MAX); 










@@ -418,12 +415,6 @@ static LC3_INT16  plc_phEcu_nonpure_tone_ana(const LC3_INT32* plocs, const LC3_I













	{















		/* delta taper-off analysis solution, less sensitive to input bandwidth limitation and levels   */





























#if 0













        /* note: in BASOP the Xavg ratios below are calculated in log2 domain on a maximally upshifted Xavg vector.  













                   if Xavg is an all zero vector in  BASOP, then the nonpure_tone_detect flag is or'ed with 0x100 , 













                   to trigger normal valley noise generation   */













#endif





























		   /* verify that an assumed  clean sine does not have any odd HF content indications by thresholding the accumulated delta rise in  LF/HF side lobes   */















		for (i = (sineband_ind_high + 1); i < (N_grp - 1); i++) {















			tmp = (Xavg[i + 1] + LC3_EPS) / (Xavg[i] + LC3_EPS);

































lib_lc3plus/plc_phecu_tba_trans_dect_gains.c



+0
−4




























Original line number
Diff line number
Diff line








@@ -101,10 +101,6 @@ const LC3_INT32  POW_ATT_TABLE_p4x1_6[OFF_FRAMES_LIMIT + 1] = {













     0,      0,      0,      0,      0,      0,      0,      0,      0,      0,     0 };































#ifdef CR8_A_PLC_FADEOUT_TUNING













#if 0













/*  POW_ATT_TABLES now  ordered logically based on initial slow muting phase time  */













/*  POW_ATT_TABLES[ind] is used after the initial gain==1.0 no energy muting phase */













#endif















const LC3_INT32 *const POW_ATT_TABLES[1 + 12] =















{ NULL,















/*0.3dB col      ,      0.4dB col */