Commit d62e64a2 authored by vaillancour's avatar vaillancour
Browse files

adapting extra difference to try keeping EVS be

parent f6462beb

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -116,7 +116,8 @@ 
#define FIX_BASOP_2531_MCT_CP_BITRATE                   /* FhG: BASOP issue 2531: Fix MCT cp_bitrate calculation; affects bitrate switching only */

#define FIX_BASOP_2541_OMASA_ENC_FIXES                  /* Nokia: BASOP issue 2541: Fix function ivas_encode_masaism_metadata_fx */

#define FIX_BASOP_2545_FIX_LTV_REGRESSION_2529          /* Nokia: BASOP issue 2545: Fix LTV regression caused by issue 2529 fix */

#define FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC         /* VA : Basop issue yyyy: Align conditions in core sw dec */

#define FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC        /* VA : Basop issue 2547: Align conditions in core sw dec */

#define FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC_EVS    /* VA : Basop issue 2547: Align conditions in core sw dec, condition that could affect EVS as well, but adapted to keep EVS BE */



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

lib_dec/core_switching_dec_fx.c

+15 −3
Original line number Diff line number Diff line
@@ -741,9 +741,21 @@ ivas_error core_switching_post_dec_fx( 
    IF( st_fx->hBWE_FD != NULL &&

        ( ( NE_16( st_fx->last_extl, SWB_BWE ) && EQ_16( st_fx->extl, SWB_BWE ) ) ||

          ( NE_16( st_fx->last_extl, FB_BWE ) && EQ_16( st_fx->extl, FB_BWE ) ) ||

          ( ( EQ_16( st_fx->last_core, HQ_CORE ) || EQ_16( st_fx->last_core, TCX_20_CORE ) || EQ_16( st_fx->last_core, TCX_10_CORE ) || EQ_16( st_fx->last_extl, SWB_TBE ) ) &&

          ( EQ_16( st_fx->last_core, ACELP_CORE ) && EQ_16( st_fx->core, ACELP_CORE ) &&

            ( NE_16( st_fx->prev_coder_type, AUDIO ) && EQ_16( st_fx->coder_type, AUDIO ) ) &&

            st_fx->bws_cnt > 0 ) ||

          ( st_fx->element_mode == EVS_MONO &&

            ( ( ( EQ_16( st_fx->last_core, HQ_CORE ) || EQ_16( st_fx->last_extl, SWB_TBE ) ) &&

                st_fx->extl < 0 && NE_16( st_fx->core, HQ_CORE ) ) ||

              ( EQ_16( st_fx->last_core, ACELP_CORE ) && EQ_16( st_fx->core, ACELP_CORE ) &&

                NE_16( st_fx->prev_coder_type, INACTIVE ) && EQ_16( st_fx->coder_type, INACTIVE ) &&

                st_fx->bws_cnt > 0 ) ) ) ||

          ( st_fx->element_mode != EVS_MONO &&

            ( ( ( EQ_16( st_fx->last_core, HQ_CORE ) || EQ_16( st_fx->last_core, TCX_20_CORE ) || EQ_16( st_fx->last_core, TCX_10_CORE ) || EQ_16( st_fx->last_extl, SWB_TBE ) ) &&

                st_fx->extl < 0 && EQ_16( st_fx->core, ACELP_CORE ) ) ||

          ( EQ_16( st_fx->last_core, ACELP_CORE ) && EQ_16( st_fx->core, ACELP_CORE ) && ( ( NE_16( st_fx->prev_coder_type, INACTIVE ) && NE_16( st_fx->coder_type, INACTIVE ) ) || ( NE_16( st_fx->prev_coder_type, AUDIO ) && EQ_16( st_fx->coder_type, AUDIO ) ) ) && st_fx->bws_cnt > 0 ) ) )

              ( EQ_16( st_fx->last_core, ACELP_CORE ) && EQ_16( st_fx->core, ACELP_CORE ) &&

                NE_16( st_fx->prev_coder_type, INACTIVE ) && NE_16( st_fx->coder_type, INACTIVE ) &&

                st_fx->bws_cnt > 0 ) ) ) ) )

#endif

    {