From 99b1d6ad303693e250a7997262b3d2f507fd940a Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Mon, 6 Oct 2025 13:42:01 +0200 Subject: [PATCH] Add fix NONBE_1296_TDREND_ITD_OUT_OF_BOUNDS_ACCESS to port MR2056 --- lib_com/options.h | 1 + lib_rend/ivas_objectRenderer_sfx_fx.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index bb61c714c..a4032cc9c 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -141,6 +141,7 @@ #define FIX_1376_MISSING_ISM_METADATA /* FhG: IVAS_rend: throw error if there exists an ISM input without a corresponding metadata file path */ #define FIX_1385_INIT_IGF_STOP_FREQ /* FhG: Initialize infoIGFStopFreq in init_igf_dec() */ #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. */ /* #################### End BASOP porting switches ############################ */ diff --git a/lib_rend/ivas_objectRenderer_sfx_fx.c b/lib_rend/ivas_objectRenderer_sfx_fx.c index d179bd871..d5abdadba 100644 --- a/lib_rend/ivas_objectRenderer_sfx_fx.c +++ b/lib_rend/ivas_objectRenderer_sfx_fx.c @@ -252,8 +252,9 @@ static void sincResample_fx( p_backward_fx--; // Qx } +#ifndef NONBE_1296_TDREND_ITD_OUT_OF_BOUNDS_ACCESS tmp64_fx = W_mac_32_32( tmp64_fx, *p_forward_fx, *p_sinc_forward_fx ); /* Integer index always rounded down --> 4 steps backward, 5 steps forward */ // Qx + 32 - +#endif output_fx[i] = W_extract_h( tmp64_fx ); // Qx move32(); -- GitLab