Commit e0e8c831 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '1270-evs-ivas-counter-saturation-missing' into 'main' 

fix saturation missing in EVS counter

Closes #1270

See merge request !1099
parents 224a3b9d b0fc3fcd

lib_enc/acelp_core_enc_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ ivas_error acelp_core_enc_fx( 
        st_fx->Nb_ACELP_frames = 0;

        move16();

    }

    st_fx->Nb_ACELP_frames = add( st_fx->Nb_ACELP_frames, 1 ); // Q0

    st_fx->Nb_ACELP_frames = add_sat( st_fx->Nb_ACELP_frames, 1 ); // Q0

    move16();



    int_fs_fx = INT_FS_16k_FX;
@@ -967,7 +967,7 @@ ivas_error acelp_core_enc_ivas_fx( 
        st->Nb_ACELP_frames = 0;

        move16();

    }

    st->Nb_ACELP_frames = add( st->Nb_ACELP_frames, 1 );

    st->Nb_ACELP_frames = add_sat( st->Nb_ACELP_frames, 1 );

    move16();



    IF( EQ_16( st->L_frame, L_FRAME ) )

lib_enc/energy_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static void update_sb_bg_energy( 
    Word32 sb_bg_energy_ti, tmp;

    Word16 tmpQ, i;



    *tbg_energy_count = add( *tbg_energy_count, 1 ); /* Q0 */

    *tbg_energy_count = add_sat( *tbg_energy_count, 1 ); /* Q0 */

    move16();

    tmpQ = add( tmp_Q_add, frame_sb_energy_scale );