Commit 3dfe34ed authored by vaclav's avatar vaclav
Browse files

Merge branch '1927-ref-PortFlpMr2037' into 'ivas-float-update' 

[non-BE] Port MR2037 from float to FLP-ref

See merge request !2116
parents 1e610544 de7631f2

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ 
#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */

#define NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC      /* FhG: fix out-of-bound errors when switching from SID frame to active frame*/

#define NONBE_FIX_1052_SBA_EXT_FIX                      /* VA: SBA external output support fix - do not overwrite "output_config" parameter */



#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 FIX_1113_CLDFB_REND_IN_ISAR                     /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */

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

lib_dec/ivas_stereo_switching_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -1141,7 +1141,11 @@ void synchro_synthesis( 
        /* handling of TD->DFT switching */

        for ( n = 0; n < hCPE->nchan_out; n++ )

        {

#ifdef NONBE_1289_STEREO_SW_TO_MONO

            if ( ( !use_cldfb_for_last_dft && hCPE->last_element_mode != IVAS_CPE_DFT && !sba_dirac_stereo_flag && dft_mono_brate_switch != -1 ) || dft_mono_brate_switch == 1 )

#else

            if ( ( hCPE->last_element_mode != IVAS_CPE_DFT && !sba_dirac_stereo_flag && dft_mono_brate_switch != -1 ) || dft_mono_brate_switch == 1 )

#endif

            {

                float *pPrev_synth;

                float inv_fade_len = 1.f / delay_diff;