From 541d242e628f8e068daf9a338aa0575e2219c567 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 17 Aug 2023 20:36:54 +0200
Subject: [PATCH] Fix for limiter deactivation in EVS and AMR-WB IO modes under
 API_5MS

---
 apps/renderer.c        |  4 +---
 lib_dec/ivas_jbm_dec.c | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/apps/renderer.c b/apps/renderer.c
index 36ea05c60c..858a9d4150 100644
--- a/apps/renderer.c
+++ b/apps/renderer.c
@@ -218,9 +218,7 @@ typedef enum
 #endif
     CmdLnOptionId_referenceVectorFile,
     CmdLnOptionId_exteriorOrientationFile,
-#ifdef API_5MS
     CmdLnOptionId_framing5ms,
-#endif
     CmdLnOptionId_syncMdDelay,
     CmdLnOptionId_directivityPatternId,
     CmdLnOptionId_acousticEnvironmentId
@@ -1534,8 +1532,8 @@ int main(
 #endif
         );
 
-#ifdef API_5MS
         int16_t num_subframes, sf_idx;
+#ifdef API_5MS
         num_subframes = ( args.framing_5ms ) ? 1 : IVAS_MAX_PARAM_SPATIAL_SUBFRAMES;
 #else
         num_subframes = IVAS_MAX_PARAM_SPATIAL_SUBFRAMES;
diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c
index 0880b00038..1abebe3c0b 100644
--- a/lib_dec/ivas_jbm_dec.c
+++ b/lib_dec/ivas_jbm_dec.c
@@ -1192,9 +1192,15 @@ ivas_error ivas_jbm_dec_render(
     if ( st_ivas->hDecoderConfig->Opt_Limiter )
 #endif
     {
-
+#ifdef API_5MS
+        if ( !( st_ivas->ivas_format == MONO_FORMAT ) )
+        {
+#endif
 #ifndef DISABLE_LIMITER
-        ivas_limiter_dec( st_ivas->hLimiter, p_output, nchan_out, *nSamplesRendered, st_ivas->BER_detect );
+            ivas_limiter_dec( st_ivas->hLimiter, p_output, nchan_out, *nSamplesRendered, st_ivas->BER_detect );
+#endif
+#ifdef API_5MS
+        }
 #endif
     }
 
@@ -1404,8 +1410,15 @@ ivas_error ivas_jbm_dec_flush_renderer(
     if ( st_ivas->hDecoderConfig->Opt_Limiter )
 #endif
     {
+#ifdef API_5MS
+        if ( !( st_ivas->ivas_format == MONO_FORMAT ) )
+        {
+#endif
 #ifndef DISABLE_LIMITER
-        ivas_limiter_dec( st_ivas->hLimiter, p_output, st_ivas->hDecoderConfig->nchan_out, *nSamplesRendered, st_ivas->BER_detect );
+            ivas_limiter_dec( st_ivas->hLimiter, p_output, st_ivas->hDecoderConfig->nchan_out, *nSamplesRendered, st_ivas->BER_detect );
+#endif
+#ifdef API_5MS
+        }
 #endif
     }
 
-- 
GitLab