From 15af1606b88832cd1aaeb8cb254f94a9367e68a6 Mon Sep 17 00:00:00 2001 From: Kacper Sagnowski Date: Wed, 5 Nov 2025 17:00:16 +0100 Subject: [PATCH 1/2] Fix duplicated declarations under FIX_1119_SPLIT_RENDERING_VOIP --- lib_isar/isar_splitRendererPre.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib_isar/isar_splitRendererPre.c b/lib_isar/isar_splitRendererPre.c index 37985e492..8632b0aec 100644 --- a/lib_isar/isar_splitRendererPre.c +++ b/lib_isar/isar_splitRendererPre.c @@ -3046,7 +3046,11 @@ ivas_error isar_renderMultiTDBinToSplitBinaural( move32(); FOR( i = 0; i < num_poses * BINAURAL_CHANNELS; i++ ) { +#ifdef FIX_1119_SPLIT_RENDERING_VOIP + FOR( j = 0; j < CLDFB_NO_COL_MAX; j++ ) +#else FOR( Word16 j = 0; j < CLDFB_NO_COL_MAX; j++ ) +#endif { scale_factor = s_min( scale_factor, s_min( getScaleFactor32( Cldfb_In_BinReal_fx[i][j], CLDFB_NO_CHANNELS_MAX ), getScaleFactor32( Cldfb_In_BinImag_fx[i][j], CLDFB_NO_CHANNELS_MAX ) ) ); } @@ -3054,7 +3058,11 @@ ivas_error isar_renderMultiTDBinToSplitBinaural( scale_factor = sub( scale_factor, 2 ); FOR( i = 0; i < num_poses * BINAURAL_CHANNELS; i++ ) { +#ifdef FIX_1119_SPLIT_RENDERING_VOIP + FOR( j = 0; j < CLDFB_NO_COL_MAX; j++ ) +#else FOR( Word16 j = 0; j < CLDFB_NO_COL_MAX; j++ ) +#endif { Scale_sig32( Cldfb_In_BinReal_fx[i][j], CLDFB_NO_CHANNELS_MAX, scale_factor ); Scale_sig32( Cldfb_In_BinImag_fx[i][j], CLDFB_NO_CHANNELS_MAX, scale_factor ); -- GitLab From cd528aa07374ebb918eae173de4fb55c376f891f Mon Sep 17 00:00:00 2001 From: Kacper Sagnowski Date: Wed, 5 Nov 2025 17:03:10 +0100 Subject: [PATCH 2/2] Trigger CI -- GitLab