Commit 8b435d68 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC

parent d5122b97

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ 
#define FIX_1548_HARMONIZE_NON_DIEGETIC_PANNING_LAW     /* Orange: float issue 1548: Harmonize non diegetic panning law in ISM and renderers */

#define FIX_1452_DEFAULT_REVERB                         /* Nokia/Philips/FhG: Fix default room presets and their usage in renderer */

#define NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549       /* FhG: Correct scale inconsistency of old_inp_16k_fx buffer scale. */

#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 */

#define FIX_BASOP_2548_ProcessIGF_fx_PREDICTIONGAIN     /* FhG: fixes obvious bug for IVAS path. For EVS path, issue is still not resolved */

#define FIX_FMSW_DEC                                    /* float issue 1542: fix JBM issue in format switching */

lib_dec/core_switching_dec_fx.c

+0 −10
Original line number Diff line number Diff line
@@ -183,9 +183,7 @@ void bw_switching_pre_proc_fx( 
    {

        st_fx->prev_ener_shb_fx = 0;

        move16();

#ifdef FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC

        IF( st_fx->hBWE_FD != NULL )

#endif

        {

            set16_fx( st_fx->hBWE_FD->prev_SWB_fenv_fx, 0, SWB_FENV );

        }
@@ -572,11 +570,7 @@ ivas_error core_switching_post_dec_fx( 
                hBWE_TD->bwe_non_lin_prev_scale_fx = L_deposit_l( 0 );

                move32();

            }

#ifndef FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC

            IF( st_fx->hHQ_core != NULL && !( EQ_16( inner_frame_tbl[st_fx->bwidth], L_FRAME16k ) && EQ_32( st_fx->core_brate, HQ_32k ) ) )

#else

            IF( st_fx->hHQ_core != NULL && !( EQ_16( inner_frame_tbl[st_fx->bwidth], L_FRAME16k ) && LE_32( st_fx->core_brate, HQ_32k ) ) )

#endif

            {

                set32_fx( hHQ_core->prev_env_fx, 0, SFM_N_WB );

                set32_fx( hHQ_core->prev_normq_fx, 0, SFM_N_WB );
@@ -883,11 +877,7 @@ ivas_error core_switching_post_dec_fx( 


        /* reset WB TBE buffers */

        test();

#ifndef FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC

        IF( NE_16( st_fx->last_extl, WB_TBE ) && EQ_16( st_fx->extl, WB_TBE ) )

#else

        IF( NE_16( st_fx->last_extl, WB_TBE ) && EQ_16( st_fx->extl, WB_TBE ) && NE_16( st_fx->last_core, TCX_20_CORE ) && NE_16( st_fx->last_core, TCX_10_CORE ) )

#endif

        {

            wb_tbe_extras_reset_fx( hBWE_TD->mem_genSHBexc_filt_down_wb2_fx, hBWE_TD->mem_genSHBexc_filt_down_wb3_fx );

            wb_tbe_extras_reset_synth_fx( hBWE_TD->state_lsyn_filt_shb_fx, hBWE_TD->state_lsyn_filt_dwn_shb_fx, hBWE_TD->state_32and48k_WB_upsample_fx, hBWE_TD->mem_resamp_HB_fx );