From d6011bf22e81df2d5a05192797b0c0472d6554f0 Mon Sep 17 00:00:00 2001 From: rhb Date: Mon, 20 Feb 2023 14:23:18 +0100 Subject: [PATCH] bring back fixes for issue 345 which were removed by commit bfc7f521 --- lib_dec/ivas_sba_dirac_stereo_dec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) mode change 100644 => 100755 lib_dec/ivas_sba_dirac_stereo_dec.c diff --git a/lib_dec/ivas_sba_dirac_stereo_dec.c b/lib_dec/ivas_sba_dirac_stereo_dec.c old mode 100644 new mode 100755 index bbd612b7ec..f8f57ae53c --- a/lib_dec/ivas_sba_dirac_stereo_dec.c +++ b/lib_dec/ivas_sba_dirac_stereo_dec.c @@ -964,12 +964,16 @@ void ivas_sba_dirac_stereo_dec( mvr2r( tmp_buf, hSCE->prev_hb_synth, memOffset ); } - if ( ( hCPE->hCoreCoder[0]->core == ACELP_CORE || hCPE->hCoreCoder[0]->last_core == ACELP_CORE ) && !fd_cng_flag ) + if ( ( hCPE->hCoreCoder[0]->core == ACELP_CORE || hCPE->hCoreCoder[0]->last_core == ACELP_CORE ) && !fd_cng_flag +#if defined DFT_STEREO_SPAR_MIXING && defined FIX_345_MSAN_ERROR + && st_ivas->nchan_transport == 1 +#endif + ) { /* upmix ACELP BWE */ ivas_sba_dirac_stereo_compute_hb_gain( hStereoDft, hb_gain ); -#ifdef DFT_STEREO_SPAR_MIXING +#if defined DFT_STEREO_SPAR_MIXING && !defined FIX_345_MSAN_ERROR if ( st_ivas->nchan_transport == 1 ) #endif { -- GitLab