Commit d0d59a22 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_1289_STEREO_SW_TO_MONO

parent 8732fd3a

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ 
#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */



#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */

#define NONBE_1289_STEREO_SW_TO_MONO                    /* VA: issue 1289: Fix glitch when stereo signal is decoded to mono n TD->DFT switching */

#define NONBE_FIX_1196_TD_HEADTRACKING_INTERPOLATION    /* Ericsson: Issue 1196, Always apply filter interpolation for each subframe */

#define NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING       /* VA: issue 1110: fix encoder crash in the stereo DTX bitrate switching condition */

#define FIX_1099_JBM_MD_HANDLE_ALLOC                    /* VA: issue 1099: Limit the allocation of `hJbmMetadata` handle to MASA and OMASA only */

lib_dec/ivas_stereo_switching_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1268,12 +1268,8 @@ void synchro_synthesis_fx( 
            test();

            test();

            test();

#ifdef NONBE_1289_STEREO_SW_TO_MONO

            test();

            IF( ( !use_cldfb_for_last_dft && NE_16( hCPE->last_element_mode, IVAS_CPE_DFT ) && !sba_dirac_stereo_flag && NE_16( dft_mono_brate_switch, -1 ) ) || EQ_16( dft_mono_brate_switch, 1 ) )

#else

            IF( ( NE_16( hCPE->last_element_mode, IVAS_CPE_DFT ) && !sba_dirac_stereo_flag && NE_16( dft_mono_brate_switch, -1 ) ) || EQ_16( dft_mono_brate_switch, 1 ) )

#endif

            {

                Word32 *pPrev_synth_fx;

                Word32 inv_fade_len_fx = 0;