From 2eaa1f09962b9855747564429f7f8b8d71f66ef3 Mon Sep 17 00:00:00 2001 From: Jouni Paulus Date: Wed, 2 Aug 2023 11:51:31 +0200 Subject: [PATCH 1/2] add missing inclusion of wmc_auto.h --- lib_dec/ivas_omasa_dec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib_dec/ivas_omasa_dec.c b/lib_dec/ivas_omasa_dec.c index 70cba6176b..7cff26a856 100644 --- a/lib_dec/ivas_omasa_dec.c +++ b/lib_dec/ivas_omasa_dec.c @@ -40,6 +40,7 @@ #ifdef DEBUGGING #include "debug.h" #endif +#include "wmc_auto.h" #ifdef MASA_AND_OBJECTS -- GitLab From b1523ce77c2db7877e6dd19d006368e357ae24ae Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Wed, 2 Aug 2023 15:05:20 +0300 Subject: [PATCH 2/2] Fix by setting last_ivas_format in JBM dec. --- lib_dec/ivas_jbm_dec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index 436c08c417..276fdff4e3 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -555,6 +555,10 @@ ivas_error ivas_jbm_dec_tc( st_ivas->ini_active_frame++; } +#ifdef MASA_AND_OBJECTS + st_ivas->last_ivas_format = st_ivas->ivas_format; +#endif + #ifdef DEBUG_MODE_INFO dbgwrite( &st_ivas->bfi, sizeof( int16_t ), 1, output_frame, "res/bfi" ); dbgwrite( &st_ivas->BER_detect, sizeof( int16_t ), 1, output_frame, "res/BER_detect" ); -- GitLab