From 42ebf35c842b6304bf7d1ad2425d0186c8fbe139 Mon Sep 17 00:00:00 2001
From: Markus Multrus <markus.multrus@iis.fraunhofer.de>
Date: Sat, 4 Oct 2025 20:33:17 +0200
Subject: [PATCH] port Flp MR 2040

---
 lib_com/options.h     |  2 ++
 lib_dec/jbm_jb4_jmf.c |  2 +-
 lib_dec/jbm_jb4sb.c   | 24 ++++++++++++++++++++++++
 lib_dec/jbm_jb4sb.h   |  4 ++++
 lib_dec/lib_dec.c     |  7 +++++++
 5 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/lib_com/options.h b/lib_com/options.h
index 328d1aa08..32b1c511b 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -194,6 +194,8 @@
 #define FIX_1053_REVERB_RECONFIGURATION
 #define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */
 #define FIX_1113_EXTREND_ISAR                           /* FhG: issue 1113: fix external renderer asserts for FOA/HOA2 and CLDFB config */
+#define NONBE_1122_JBM_FIX_PLAYOUT_DELAY_IN_DTX         /* FhG: Avoid JBM ignoring safety margin and setting playout delay to 0 during DTX */
+#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */
 
 /* #################### End BASOP porting switches ############################ */
 
diff --git a/lib_dec/jbm_jb4_jmf.c b/lib_dec/jbm_jb4_jmf.c
index 721a6937d..9abb3d973 100644
--- a/lib_dec/jbm_jb4_jmf.c
+++ b/lib_dec/jbm_jb4_jmf.c
@@ -208,7 +208,7 @@ int16_t JB4_JMF_PushPacket(
 
     rtpTimeDiff = (int32_t) ( rtpTimeStamp - h->lastRtpTimeStamp );
     sysTimeDiff = sysTime - h->lastSysTime;
-    offset = sysTime - rtpTimeStamp;
+    offset = (int32_t) sysTime - (int32_t) rtpTimeStamp;
 
     /* get the delay (yes, signed!!!!) */
     delay = sysTimeDiff - rtpTimeDiff + h->lastDelay;
diff --git a/lib_dec/jbm_jb4sb.c b/lib_dec/jbm_jb4sb.c
index c1e728e10..ad3ba459a 100644
--- a/lib_dec/jbm_jb4sb.c
+++ b/lib_dec/jbm_jb4sb.c
@@ -199,6 +199,9 @@ struct JB4
     JB4_DATAUNIT_HANDLE freeMemorySlots[MAX_JBM_SLOTS];
     uint16_t nFreeMemorySlots;
     /*@} */
+#ifdef NONBE_1122_KEEP_EVS_MODE_UNCHANGED
+    bool evsMode;
+#endif
 }; /* JB4 */
 
 
@@ -293,6 +296,9 @@ ivas_error JB4_Create(
         h->freeMemorySlots[iter] = &h->memorySlots[iter];
     }
     h->nFreeMemorySlots = MAX_JBM_SLOTS;
+#ifdef NONBE_1122_KEEP_EVS_MODE_UNCHANGED
+    h->evsMode = false;
+#endif
     *ph = h;
 
     return IVAS_ERR_OK;
@@ -369,6 +375,12 @@ ivas_error JB4_Init(
     return IVAS_ERR_OK;
 }
 
+#ifdef NONBE_1122_KEEP_EVS_MODE_UNCHANGED
+void JB4_TMP_SetEvsCompatFlag( JB4_HANDLE h )
+{
+    h->evsMode = true;
+}
+#endif
 
 /* Returns a memory slot to store a new data unit */
 JB4_DATAUNIT_HANDLE JB4_AllocDataUnit(
@@ -671,10 +683,22 @@ static void JB4_targetPlayoutDelay(
         *targetStartUp = ( *targetMin + *targetMax ) / 2;
     }
 
+#ifdef NONBE_1122_JBM_FIX_PLAYOUT_DELAY_IN_DTX
+#ifdef NONBE_1122_KEEP_EVS_MODE_UNCHANGED
+    if ( !h->evsMode )
+    {
+#endif
+        *targetDtx = JB4_MAX( *targetDtx, (uint32_t) h->safetyMargin );
+#ifdef NONBE_1122_KEEP_EVS_MODE_UNCHANGED
+    }
+#endif
+    *targetStartUp = JB4_MAX( *targetStartUp, (uint32_t) h->safetyMargin );
+#else
     if ( *targetStartUp < 60 )
     {
         *targetStartUp = 60;
     }
+#endif
 
     return;
 }
diff --git a/lib_dec/jbm_jb4sb.h b/lib_dec/jbm_jb4sb.h
index 3d4872349..8155d66ae 100644
--- a/lib_dec/jbm_jb4sb.h
+++ b/lib_dec/jbm_jb4sb.h
@@ -86,6 +86,10 @@ void JB4_Destroy( JB4_HANDLE *ph );
 
 ivas_error JB4_Init( JB4_HANDLE h, const int16_t safetyMargin );
 
+#ifdef NONBE_1122_KEEP_EVS_MODE_UNCHANGED
+void JB4_TMP_SetEvsCompatFlag( JB4_HANDLE h );
+#endif
+
 JB4_DATAUNIT_HANDLE JB4_AllocDataUnit( JB4_HANDLE h );
 
 void JB4_FreeDataUnit( JB4_HANDLE h, JB4_DATAUNIT_HANDLE dataUnit );
diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c
index 25cf78924..f44d6e63a 100644
--- a/lib_dec/lib_dec.c
+++ b/lib_dec/lib_dec.c
@@ -784,6 +784,13 @@ ivas_error IVAS_DEC_EnableVoIP(
         return IVAS_ERR_FAILED_ALLOC;
     }
 
+#ifdef NONBE_1122_KEEP_EVS_MODE_UNCHANGED
+    if ( hIvasDec->mode == IVAS_DEC_MODE_EVS )
+    {
+        JB4_TMP_SetEvsCompatFlag( hIvasDec->hVoIP->hJBM );
+    }
+#endif
+
     return IVAS_ERR_OK;
 }
 
-- 
GitLab