From 85f813d9bdaa1e0d004c61f4cd6538e93b822866 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 10 Oct 2025 13:59:48 +0200
Subject: [PATCH] Add NONBE_1300_TDREND_LARGE_ITD to port MR2070

---
 lib_com/options.h              |  1 +
 lib_rend/ivas_objectRenderer.c | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/lib_com/options.h b/lib_com/options.h
index 7cfe42215..e89adb77a 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -205,6 +205,7 @@
 #define FIX_1387_INIT_PRM_SQQ                           /* FhG: initialize pointer prm_sqQ, which might be uninitialized in case of bfi == 1 */
 #define NONBE_1296_TDREND_ITD_OUT_OF_BOUNDS_ACCESS      /* Eri: issue 1296: ITD resampling can occasionally read out of bounds, especially when the requested subframes are short (1.25 ms). Seen for headtracking+JBM. */
 #define FIX_1349_TNS_CRASH                              /* FhG: Fix crash in TNS entropy coding, in case order of joint TNS coding is reduced to 0 */
+#define NONBE_1300_TDREND_LARGE_ITD                     /* Eri: issue 1300: There was a bug feeding 1.25 ms frames to the TD renderer, causing out-of-buffer access. This was resolved. However, it is still possible that modeled HRTF with large ITDs could trigger out-of-buffer access. This adds a check to prevent this.*/
 
 /* #################### End BASOP porting switches ############################ */
 
diff --git a/lib_rend/ivas_objectRenderer.c b/lib_rend/ivas_objectRenderer.c
index 879aa5e90..f0017090a 100644
--- a/lib_rend/ivas_objectRenderer.c
+++ b/lib_rend/ivas_objectRenderer.c
@@ -437,6 +437,9 @@ ivas_error TDREND_GetMix(
     float hrf_left_delta[SFX_SPAT_BIN_MAX_FILTER_LENGTH];
     float hrf_right_delta[SFX_SPAT_BIN_MAX_FILTER_LENGTH];
     int16_t intp_count;
+#ifdef NONBE_1300_TDREND_LARGE_ITD
+    int16_t currShift, prevShift, transition_len, length_in2;
+#endif
 
     error = IVAS_ERR_OK;
 
@@ -462,6 +465,21 @@ ivas_error TDREND_GetMix(
         {
             TDREND_SRC_REND_UpdateFiltersFromSpatialParams( hBinRendererTd, SrcRend_p, SrcSpatial_p, Src_p->hrf_left_prev,
                                                             Src_p->hrf_right_prev, hrf_left_delta, hrf_right_delta, &intp_count, &Src_p->filterlength, &Src_p->itd, &Src_p->Gain, Src_p );
+#ifdef NONBE_1300_TDREND_LARGE_ITD
+            /* For large ITD values at lower sampling rate, check if the transition can be done */
+            if ( Src_p->itd * Src_p->previtd < 0 )
+            {
+                currShift = (int16_t) abs( Src_p->itd );
+                prevShift = (int16_t) abs( Src_p->previtd );
+                transition_len = subframe_length - max( 0, SFX_SPAT_BIN_SINC_M - currShift );
+                length_in2 = transition_len - (int16_t) ( ( (float) ( transition_len * prevShift ) / ( (float) ( prevShift + currShift ) ) ) + 0.5f ) - currShift;
+                if ( length_in2 <= 0 )
+                {
+                    /* Subframe too short for ITD transition -- change to ITD=0 and push the rest of the transition to next subframe */
+                    Src_p->itd = 0;
+                }
+            }
+#endif
         }
 
         /* Render source if needed */
-- 
GitLab