From b30482dbe455933a5c3bd1a68ad87e9fa5af2b49 Mon Sep 17 00:00:00 2001 From: vaclav Date: Thu, 19 Oct 2023 18:18:32 +0200 Subject: [PATCH] Add missing reset of parameter hCPE->brate_surplus in OMASA decoder; under NONBE_877_OMASA_RESET_BRATE_SURPLUS --- lib_com/options.h | 1 + lib_dec/ivas_masa_dec.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index 83481715bb..5151a4a5dc 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -167,6 +167,7 @@ #define NONBE_FIX_861_MASA_CRASH_STEREO_SWITCHING /* VA: issue 861: fix MASA 2TC crash when switching from MDCT stereo to TD/DFT stereo */ #define BE_FIX_867_PARAMC_RECONFIG /* FhG: issue #867: fix ParamMC CLDFB buffer dealloc when reconfiguring */ #define NONBE_FIX_850_MASA_HBR_META_RATIO_DECODING /* Nokia: issue #850: Fixes rare non-valid diffuseness and energy ratio values in 2dir MASA. */ +#define NONBE_877_OMASA_RESET_BRATE_SURPLUS /* VA: Add missing reset of parameter hCPE->brate_surplus in OMASA decoder */ /* ##################### End NON-BE switches ########################### */ diff --git a/lib_dec/ivas_masa_dec.c b/lib_dec/ivas_masa_dec.c index a160275ea9..2ea90fa915 100644 --- a/lib_dec/ivas_masa_dec.c +++ b/lib_dec/ivas_masa_dec.c @@ -1456,6 +1456,13 @@ ivas_error ivas_masa_dec_reconfigure( { st_ivas->nchan_ism = 0; st_ivas->ism_mode = ISM_MODE_NONE; + +#ifdef NONBE_877_OMASA_RESET_BRATE_SURPLUS + if ( st_ivas->hCPE[0] != NULL ) + { + st_ivas->hCPE[0]->brate_surplus = 0; + } +#endif } #ifndef NONBE_UNIFIED_DECODING_PATHS -- GitLab