From a75a3adb32faa2b9899a118987657d1ba607731e Mon Sep 17 00:00:00 2001 From: rhb Date: Tue, 9 May 2023 17:27:59 +0200 Subject: [PATCH] fix discrepancy with EVS code that could cause crashes in rare cases --- lib_com/options.h | 2 +- lib_enc/ext_sig_ana.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) mode change 100644 => 100755 lib_com/options.h mode change 100644 => 100755 lib_enc/ext_sig_ana.c diff --git a/lib_com/options.h b/lib_com/options.h old mode 100644 new mode 100755 index 9c461d84e6..9ade0466dd --- a/lib_com/options.h +++ b/lib_com/options.h @@ -179,7 +179,7 @@ #define FIX_355_REFACTOR_PARAMBIN_TO_5MS /* Nokia: Fixes issue 355 by refactoring parametric binauralizer code to 5 ms mode */ #define FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING /* Eri: Fix incorrect use of stack variable used for channel aware config file */ #define COMBINED_FORMAT_SIGNALING /* VA: Introduce a signaling bit for combined format coding */ - +#define FIX_446_STEREO_DMX_CRASH /* FhG: fix discrepancy with EVS code that could cause crashes in rare cases */ /* ################## End DEVELOPMENT switches ######################### */ diff --git a/lib_enc/ext_sig_ana.c b/lib_enc/ext_sig_ana.c old mode 100644 new mode 100755 index 80e652cf07..f79fbb5f95 --- a/lib_enc/ext_sig_ana.c +++ b/lib_enc/ext_sig_ana.c @@ -444,10 +444,19 @@ void core_signal_analysis_high_bitrate( ProcessIGF( st, hTcxEnc->spectrum[frameno], hTcxEnc->spectrum[frameno], powerSpec, transform_type[frameno] == TCX_20, frameno, 0, vad_hover_flag ); } +#ifndef FIX_446_STEREO_DMX_CRASH /* Copy memory */ mvr2r( lsp_new, st->lspold_enc, M ); +#endif } } +#ifdef FIX_446_STEREO_DMX_CRASH + if ( st->element_mode != IVAS_CPE_MDCT ) + { + /* Copy memory */ + mvr2r( lsp_new, st->lspold_enc, M ); + } +#endif return; } -- GitLab