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

Merge branch '674-saturation-in-sba-3oa-bitrate-switching' into 'main' 

Resolve "Saturation in SBA 3OA bitrate switching"

Closes #674

See merge request !155
parents 15ed3893 55169831

lib_com/cldfb.c

+0 −3
Original line number Diff line number Diff line
@@ -1748,9 +1748,6 @@ void resampleCldfb_ivas( 


    /*low complexity-resampling only stored previous samples that are needed for next frame modulation */

    lerp_flt( hs->cldfb_state, hs->cldfb_state, timeOffset, timeOffsetold );

#ifdef IVAS_FLOAT_FIXED

    L_lerp_fx_q11( hs->cldfb_state_fx, hs->cldfb_state_fx, timeOffset, timeOffsetold );

#endif



    return;

}

lib_dec/core_switching_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1357,11 +1357,11 @@ static void core_switch_lb_upsamp_fx( 
    /* check if the CLDFB works on the right sample rate */

    IF( NE_16( ( st->cldfbAna->no_channels * st->cldfbAna->no_col ), st->L_frame ) )

    {

        resampleCldfb_ivas( st->cldfbAna, L_mult0( st->L_frame, FRAMES_PER_SEC ) );

        resampleCldfb_ivas_fx( st->cldfbAna, L_mult0( st->L_frame, FRAMES_PER_SEC ) );



        IF( st->cldfbBPF != NULL && LE_16( st->L_frame, L_FRAME16k ) )

        {

            resampleCldfb_ivas( st->cldfbBPF, L_mult0( st->L_frame, FRAMES_PER_SEC ) );

            resampleCldfb_ivas_fx( st->cldfbBPF, L_mult0( st->L_frame, FRAMES_PER_SEC ) );

        }



        IF( GT_16( st->ini_frame, 0 ) )