Commit b5d895ed authored by norvell's avatar norvell
Browse files

Add draft fix for issue 639 under CR_FIX_639_HQ_ACELP_TRANSITION

parent 770da975

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ 
/* any switch which is non-be wrt operation points tested in selection */

/* all switches in this category should start with "CR_" */

#define CR_FIX_585_MASA_2TC_DTX_EXT                     /* Nokia: issue 585: fixes transition artifacts in MASA 2TC DTX by applying correct condition */



#define CR_FIX_639_HQ_ACELP_TRANSITION                  /* Ericsson: Issue 639: Wrong sampling rate of SWB TBE excitation memory in 16 kHz core for DFT Stereo@32 kbps */

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

lib_dec/acelp_core_dec.c

+11 −0
Original line number Diff line number Diff line
@@ -707,7 +707,18 @@ ivas_error acelp_core_dec( 
            if ( st->last_core != ACELP_CORE && st->element_mode > EVS_MONO )

            {

                /* Prepare ACB memory of old_bwe_exc */

#ifdef CR_FIX_639_HQ_ACELP_TRANSITION

                if (st->L_frame == L_FRAME )

                {

                    lerp( old_exc, old_bwe_exc, L_EXC_MEM_DEC * HIBND_ACB_L_FAC, L_EXC_MEM_DEC );

                }

                else

                {

                    lerp( old_exc, old_bwe_exc, L_EXC_MEM_DEC * 2, L_EXC_MEM_DEC );

                }

#else

                lerp( old_exc, old_bwe_exc, L_EXC_MEM_DEC * HIBND_ACB_L_FAC, L_EXC_MEM_DEC );

#endif

            }



            /*-----------------------------------------------------------------*

lib_enc/acelp_core_enc.c

+11 −0
Original line number Diff line number Diff line
@@ -461,7 +461,18 @@ ivas_error acelp_core_enc( 
        if ( st->last_core != ACELP_CORE && st->element_mode > EVS_MONO )

        {

            /* Prepare ACB memory of old_bwe_exc */

#ifdef CR_FIX_639_HQ_ACELP_TRANSITION

            if ( st->L_frame == L_FRAME )

            {

                lerp( old_exc, old_bwe_exc, L_EXC_MEM_DEC * HIBND_ACB_L_FAC, L_EXC_MEM_DEC );

            }

            else

            {

                lerp( old_exc, old_bwe_exc, L_EXC_MEM_DEC * 2, L_EXC_MEM_DEC );

            }

#else

            lerp( old_exc, old_bwe_exc, L_EXC_MEM_DEC * HIBND_ACB_L_FAC, L_EXC_MEM_DEC );

#endif

        }