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

Merge branch... 

Merge branch '680-issue-one-frame-boundaries-when-switching-from-dtx-or-cng-to-mdct-48kbps' into 'main'

Proposed fixed to 680, where the scaling of the OVA step is correted

See merge request !331
parents 259ad3a7 d25eb903

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ 
#define FIX_734_MISSING_SUBFR_LOW_RATE_ACELP

#define FIX_747_TDBWE_ENERGY_BURST

#define FIX_770_DISCONTINUITIES_SW_TCX2ACELP  // Fix discontinuities when switching from TCX to ACELP

#define FIX_680_CNG_FRAME_BOUNDARIES_ISSUE /* Step was right shift by 2, which made the OVA wrong */

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



/* clang-format on */

lib_dec/core_switching_dec_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -2325,7 +2325,9 @@ static void smoothTransitionDtxToTcx_fx( 


    /* apply fades around transition */

    step = div_s( 1, delay_comp );

#ifndef FIX_680_CNG_FRAME_BOUNDARIES_ISSUE  /* Step has to be in Q15, not in Q13 */

    step = shr( step, 2 );

#endif

    fade_in = extract_l( 0 );

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

    {