Commit 0478bfa5 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'EVS_JBM_differences_fix' into 'main' 

EVS JBM dec conformance fixes

See merge request !223
parents 17620912 d6209c76

apps/decoder.c

+2 −1
Original line number Diff line number Diff line
@@ -2461,12 +2461,13 @@ static ivas_error decodeVoIP( 
            }

        }



        frame++;

        if ( !arg.quietModeEnabled )

        {

            fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );

        }

        vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;

        frame++;

        //frame++;

        systemTime_ms += systemTimeInc_ms;

#ifdef WMOPS

#ifndef DONT_COUNT

lib_com/swb_bwe_com_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1544,11 +1544,15 @@ void SWB_BWE_decoding_fx( 
		exp = norm_s(SWB_FENV);

		tmp = div_s(shl(1,sub(14,exp)),SWB_FENV); /*Q(29-exp) */

		L_tmp = Mult_32_16(L_energy,tmp); /*Q(1+29-exp+1)->Q(15-exp) */

#ifdef EVS_FLOAT

#ifdef BASOP_NOGLOB

		EnergyL_16 = round_fx_sat(L_shl_sat(L_tmp, add(exp, 4))); /* Q3 */

#else

		Energy_16 = round_fx(L_shl(L_tmp,add(exp,4))); /*Q3 */

#endif

#else

		Energy_16 = round_fx(L_shl(L_tmp, add(exp, 4))); /*Q3 */

#endif // EVS_FLOAT



		IF(NE_16(last_extl, SWB_BWE) && NE_16(last_extl,FB_BWE))

		{

lib_dec/acelp_core_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ ivas_error acelp_core_dec_fx( 
                }

#endif

                /* comfort noise generation */

                CNG_exc_fx( st_fx->core_brate, st_fx->L_frame, &st_fx->hTdCngDec->Enew_fx, &st_fx->hTdCngDec->cng_seed_fx, exc_fx, exc2_fx, &st_fx->lp_ener_fx, st_fx->last_core_brate,

                CNG_exc_fx( st_fx->core_brate, st_fx->L_frame, &st_fx->hTdCngDec->Enew_fx, &st_fx->hTdCngDec->cng_seed, exc_fx, exc2_fx, &st_fx->lp_ener_fx, st_fx->last_core_brate,

                            &st_fx->first_CNG, &(st_fx->hTdCngDec->cng_ener_seed_fx), bwe_exc_fx, allow_cn_step_fx, &st_fx->hTdCngDec->last_allow_cn_step_fx, st_fx->prev_Q_exc, st_fx->Q_exc, st_fx->hTdCngDec->num_ho_fx,

                            q_env, st_fx->hTdCngDec->lp_env_fx, st_fx->hTdCngDec->old_env_fx, st_fx->hTdCngDec->exc_mem_fx, st_fx->hTdCngDec->exc_mem1_fx, sid_bw, &st_fx->hTdCngDec->cng_ener_seed1_fx, exc3_fx ,st_fx->Opt_AMR_WB, st_fx->element_mode );

#if 1//def IVAS_CODE

lib_dec/amr_wb_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ ivas_error amr_wb_dec_fx( 
            CNG_dec_fx( st_fx, EVS_MONO, Aq_fx, lsp_new_fx, lsf_new_fx, &allow_cn_step, &sid_bw, q_env );



            /* comfort noise generation */

            CNG_exc_fx( st_fx->core_brate, L_FRAME, &st_fx->hTdCngDec->Enew_fx, &st_fx->hTdCngDec->cng_seed_fx, exc_fx, exc2_fx, &st_fx->lp_ener_fx, st_fx->last_core_brate,

            CNG_exc_fx( st_fx->core_brate, L_FRAME, &st_fx->hTdCngDec->Enew_fx, &st_fx->hTdCngDec->cng_seed, exc_fx, exc2_fx, &st_fx->lp_ener_fx, st_fx->last_core_brate,

                        &st_fx->first_CNG, &st_fx->hTdCngDec->cng_ener_seed_fx, dummy_buf_fx, allow_cn_step, &st_fx->hTdCngDec->last_allow_cn_step_fx, st_fx->prev_Q_exc, st_fx->Q_exc , st_fx->hTdCngDec->num_ho_fx,

                        q_env, st_fx->hTdCngDec->lp_env_fx, st_fx->hTdCngDec->old_env_fx, st_fx->hTdCngDec->exc_mem_fx, st_fx->hTdCngDec->exc_mem1_fx, &sid_bw, &st_fx->hTdCngDec->cng_ener_seed1_fx, exc3, st_fx->Opt_AMR_WB, st_fx->element_mode);

lib_dec/cng_dec_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -929,7 +929,7 @@ static void shb_CNG_decod_fx( 
    /* generate white noise excitation */

    FOR ( i=0; i<L_FRAME16k; i++ )

    {

        excTmp_fx[i] = shr_r(Random(&st_fx->swb_cng_seed_fx), 8);

        excTmp_fx[i] = shr_r(Random(&st_fx->swb_cng_seed), 8);

        move16();/*Q-8*/

    }
@@ -1319,7 +1319,7 @@ void td_cng_dec_init( 


    hTdCngDec = st->hTdCngDec;



    hTdCngDec->cng_seed_fx = RANDOM_INITSEED; move16();

    hTdCngDec->cng_seed = RANDOM_INITSEED; move16();

    hTdCngDec->cng_ener_seed_fx = RANDOM_INITSEED; move16();

    hTdCngDec->cng_ener_seed1_fx = RANDOM_INITSEED; move16();

    hTdCngDec->old_enr_index_fx = -1; move16();