Commit db79a18b authored by vasilache's avatar vasilache
Browse files

test 1 fix for 1325

parent db0c9373

lib_com/bits_alloc.c

+4 −0
Original line number Diff line number Diff line
@@ -770,7 +770,11 @@ ivas_error config_acelp1( 


            bits -= acelp_cfg->mid_lsf_bits;

        }

#ifdef NONBE_1325_TD_STEREO_QUANT_LSF_SEC_TEST

        else if ( tdm_lp_reuse_flag == 1 && idchan == 1 )

#else

        else if ( tdm_lp_reuse_flag == 1 && idchan == 1 && active_cnt != 1 )

#endif

        {

            bits -= TDM_IC_LSF_PRED_BITS;

        }

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ 
#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */ 

#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 NONBE_1325_TD_STEREO_QUANT_LSF_SEC_TEST         /* Nokia: test one solution for usage of active_cnt variable*/

/* ##################### End NON-BE switches ########################### */



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/acelp_core_dec.c

+4 −2
Original line number Diff line number Diff line
@@ -654,20 +654,22 @@ ivas_error acelp_core_dec( 
            else

            {

                const float *pt_interp_2;



#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC_TEST

                if ( st->active_cnt != 1 )

                {

#endif

                    int16_t beta_index;



                    beta_index = get_next_indice( st, TDM_IC_LSF_PRED_BITS );

                    tdm_SCh_lsf_reuse( DEC, st->element_brate, lsf_new, lsp_new, tdm_lsfQ_PCh, NULL, &beta_index );

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC_TEST

                }

                else

                {

                    mvr2r( tdm_lspQ_PCh, lsp_new, M );

                    mvr2r( tdm_lsfQ_PCh, lsf_new, M );

                }



#endif

                if ( st->rate_switching_reset )

                {

                    /* extrapolation in case of unstable LSF convert */

lib_enc/acelp_core_enc.c

+4 −2
Original line number Diff line number Diff line
@@ -416,9 +416,10 @@ ivas_error acelp_core_enc( 
        else

        {

            const float *pt_interp_2;



#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC_TEST

            if ( st->active_cnt != 1 )

            {

#endif

                int16_t beta_index;

                float lsf_wgts[M];
@@ -430,8 +431,9 @@ ivas_error acelp_core_enc( 
                tdm_SCh_lsf_reuse( ENC, st->element_brate, lsf_new, lsp_new, tdm_lsfQ_PCh, lsf_wgts, &beta_index );



                push_indice( hBstr, IND_IC_LSF_PRED, beta_index, TDM_IC_LSF_PRED_BITS );

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC_TEST

            }



#endif

            pt_interp_2 = interpol_frac_12k8;

            if ( tdm_low_rate_mode == 1 && st->coder_type > UNVOICED )

            {