From 2a5ac5d60481996d9f5b7374d032e7dd01aa0910 Mon Sep 17 00:00:00 2001
From: vaclav <vaclav.eksler@usherbrooke.ca>
Date: Fri, 7 Mar 2025 12:19:15 +0100
Subject: [PATCH] port FIX_911_REMOVE_CREND_DUPLICATION

---
 lib_com/options.h         | 1 +
 lib_rend/ivas_crend.c     | 3 ++-
 lib_rend/ivas_prot_rend.h | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib_com/options.h b/lib_com/options.h
index 2846a9a5a..e7afafb16 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -198,6 +198,7 @@
 #define SPLIT_REND_POSE_CORRECTION_UNUSED_BITS
 #define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */
 #endif
+#define FIX_911_REMOVE_CREND_DUPLICATION                /* VA: issue 911: resolve duplication of CRend binaural external renderer function */
 
 /* #################### End BASOP porting switches ############################ */
 
diff --git a/lib_rend/ivas_crend.c b/lib_rend/ivas_crend.c
index 06e91135c..87f300adb 100644
--- a/lib_rend/ivas_crend.c
+++ b/lib_rend/ivas_crend.c
@@ -1740,6 +1740,7 @@ static ivas_error ivas_rend_crendConvolver(
 }
 
 
+#ifndef FIX_911_REMOVE_CREND_DUPLICATION
 /*-----------------------------------------------------------------------------------------*
  * Function ivas_rend_crendProcess()
  *
@@ -1881,7 +1882,7 @@ ivas_error ivas_rend_crendProcess(
     pop_wmops();
     return IVAS_ERR_OK;
 }
-
+#endif
 
 /*-----------------------------------------------------------------------------------------*
  * Function ivas_rend_crendProcessSubframe()
diff --git a/lib_rend/ivas_prot_rend.h b/lib_rend/ivas_prot_rend.h
index d48d4e853..553a4bf5e 100644
--- a/lib_rend/ivas_prot_rend.h
+++ b/lib_rend/ivas_prot_rend.h
@@ -887,6 +887,8 @@ ivas_error ivas_rend_initCrendWrapper(
 #endif
 );
 
+
+#ifndef FIX_911_REMOVE_CREND_DUPLICATION
 ivas_error ivas_rend_crendProcess(
     const CREND_WRAPPER *pCrend,
     const AUDIO_CONFIG inConfig,
@@ -904,7 +906,7 @@ ivas_error ivas_rend_crendProcess(
     const int16_t num_subframes                                 /* i  : number of subframes to render */
 #endif
 );
-
+#endif
 ivas_error ivas_rend_crendProcessSubframe(
     const CREND_WRAPPER *pCrend,                                /* i/o: Crend wrapper handle                    */
     const AUDIO_CONFIG inConfig,                                /* i  : input audio configuration               */
-- 
GitLab