diff --git a/lib_com/options.h b/lib_com/options.h index 5bb7f4c79228fc1dc04742aa050b2e7d85dc1d49..b9dbd6e1f90c48e9be52848dec52eaeb49c78b3a 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -185,6 +185,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 */ #define FIX_386_CORECODER_RECONFIG_2 /* VA: Issue 386: Resolve remaining ToDo comments in CoreCoder reconfig. */ #define FIX_440_PARAM_ISM_DIR_NOISE /* FhG: Issue 440: Fix directional background noise becoming diffuse in ParamISM */ @@ -194,11 +195,10 @@ #define FIX_447_PARAMBIN_MASA_REGU_FAC /* Nokia: Issue 447: Fix issue by adjusting regularization factor minimum value. */ #define FIX_441_SBA_PARAMBIN_GAINS /* Nokia: Fix issue 441 by changing gains in SBA path of parametric binauralizer */ - #define HODIRAC /* FhG: Sector-based HO-DirAC method for SBA at high bitrates */ #ifdef HODIRAC -#define SPAR_TUNING /* Dlb: tune SPAR for better quality */ +#define SPAR_TUNING /* Dlb: tune SPAR for better quality */ #define HODIRAC_FIX_BR_SWITCHING_DTX #endif diff --git a/lib_enc/ext_sig_ana.c b/lib_enc/ext_sig_ana.c old mode 100644 new mode 100755 index 80e652cf07c987e48b36c93a601650838efc12a3..f79fbb5f95f2def7067e134ead944591d9d6882a --- 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; }