From 5abe0dda8ed8ffa42fed8f2a8a4cd224189e432a Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Fri, 12 Jan 2024 17:34:09 +0100 Subject: [PATCH 1/2] Add fix for issue 958/667 under FIX_958_667_DISABLE_INITIAL_PLC_SUPPRESSION --- lib_com/options.h | 1 + lib_dec/lib_dec.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index fc6c6a06aa..da4764a869 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -155,6 +155,7 @@ #define FIX_638_ENERGIE_IAC_ROM_TABLES /* Orange: Missing left/right and coherence late reverb tables in binary format*/ #define FIX_OLD_BINARY_FORMAT /* Orange: temporary to maintain bitexactness */ #define FIX_WARNING_RENDER_CONFIG /* Orange: fix warning on windows build */ +#define FIX_958_667_DISABLE_INITIAL_PLC_SUPPRESSION /* Ericsson: Fix related to issue 667 in IVAS BASOP. Handling of initial lost frame in IVAS causes non-BE on EVS BASOP 26.444 */ /* #################### End BE switches ################################## */ diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index 4bf943351e..aabb1d2402 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -216,6 +216,9 @@ ivas_error IVAS_DEC_Open( st_ivas->transport_config = IVAS_AUDIO_CONFIG_INVALID; st_ivas->intern_config = IVAS_AUDIO_CONFIG_INVALID; st_ivas->writeFECoffset = 0; +#ifdef FIX_958_667_DISABLE_INITIAL_PLC_SUPPRESSION + hIvasDec->hasDecodedFirstGoodFrame = true; /* Functionality to suppress output for initial lost frames is disabled in EVS operation */ +#endif return IVAS_ERR_OK; } -- GitLab From 1f52222a55f89d842c75d0230ca9a86aa062b56d Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Fri, 12 Jan 2024 17:47:29 +0100 Subject: [PATCH 2/2] Clang format --- lib_com/options.h | 2 +- lib_dec/lib_dec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index da4764a869..56d3899545 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -155,7 +155,7 @@ #define FIX_638_ENERGIE_IAC_ROM_TABLES /* Orange: Missing left/right and coherence late reverb tables in binary format*/ #define FIX_OLD_BINARY_FORMAT /* Orange: temporary to maintain bitexactness */ #define FIX_WARNING_RENDER_CONFIG /* Orange: fix warning on windows build */ -#define FIX_958_667_DISABLE_INITIAL_PLC_SUPPRESSION /* Ericsson: Fix related to issue 667 in IVAS BASOP. Handling of initial lost frame in IVAS causes non-BE on EVS BASOP 26.444 */ +#define FIX_958_667_DISABLE_INITIAL_PLC_SUPPRESSION /* Ericsson: Fix related to issue 667 in IVAS BASOP. Handling of initial lost frame in IVAS causes non-BE on EVS BASOP 26.444 */ /* #################### End BE switches ################################## */ diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index aabb1d2402..644a4b06ea 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -218,7 +218,7 @@ ivas_error IVAS_DEC_Open( st_ivas->writeFECoffset = 0; #ifdef FIX_958_667_DISABLE_INITIAL_PLC_SUPPRESSION hIvasDec->hasDecodedFirstGoodFrame = true; /* Functionality to suppress output for initial lost frames is disabled in EVS operation */ -#endif +#endif return IVAS_ERR_OK; } -- GitLab