Commit 15fb6d8a authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_559_EXTL_IGF_MISMATCH

parent 6a6f8226

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ 
/* only BE switches wrt operation points tested in selection */



/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define FIX_559_EXTL_IGF_MISMATCH                       /* VA: issue 559: fix mismatch between st->extl and st->igf observed as crash in PlanarSBA bitrate switching */

#define FIX_571_REVERB_NOT_ACTIVATED_ISM                /* Philips: Issue 571: Reverb not activated for discrete and parametric ISM */

lib_enc/ivas_core_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -378,11 +378,7 @@ ivas_error ivas_core_enc( 
        }



        /* SWB TBE encoder */

#ifdef FIX_559_EXTL_IGF_MISMATCH

        if ( st->extl == SWB_TBE || st->extl == FB_TBE )

#else

        if ( st->extl == SWB_TBE || st->extl == FB_TBE || ( st->igf && st->core == ACELP_CORE && st->extl != WB_TBE ) )

#endif

        {

            if ( st->core_brate != FRAME_NO_DATA && st->core_brate != SID_2k40 )

            {

lib_enc/ivas_core_pre_proc.c

+0 −2
Original line number Diff line number Diff line
@@ -285,12 +285,10 @@ ivas_error pre_proc_ivas( 
    {

        SetModeIndex( st, st->bits_frame_nominal * FRAMES_PER_SEC, element_mode, MCT_flag );



#ifdef FIX_559_EXTL_IGF_MISMATCH

        if ( st->extl != -1 && st->extl != IGF_BWE && st->igf == 1 )

        {

            st->igf = 0;

        }

#endif

    }