From 9935dabab19dd2722e3ae26042f2b88604fc4d4f Mon Sep 17 00:00:00 2001
From: advasila <advasila@C-PF3GC05Q>
Date: Fri, 11 Aug 2023 12:44:42 +0300
Subject: [PATCH 1/2] fix usan

---
 lib_com/options.h             | 2 +-
 lib_enc/ivas_qspherical_enc.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib_com/options.h b/lib_com/options.h
index 6d126861a2..0b38c973da 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -240,7 +240,7 @@
 #define FIX_657_REMOVE_EDITING                          /* Nokia: Remove remaining unused coded related to object editing */
 #define FIX_634_MASA_JBM_UNUSED_PARAMETER               /* Nokia: Fix issue 634 by removing the unnecessary argument. */
 #define FIX_675_WB_OMASA                                /* Nokia: Fix for issue 675 solving the crash in OMASA for WB input */
-
+#define FIX_689_USAN_QSPHERICAL                         /* Nokia: Fix usan error from issue 689 */
 /* ################## End BE DEVELOPMENT switches ######################### */
 
 /* #################### Start NON-BE CR switches ########################## */
diff --git a/lib_enc/ivas_qspherical_enc.c b/lib_enc/ivas_qspherical_enc.c
index e79c0a01a7..2f918291c5 100644
--- a/lib_enc/ivas_qspherical_enc.c
+++ b/lib_enc/ivas_qspherical_enc.c
@@ -64,7 +64,11 @@ void quantize_direction_frame(
 )
 {
     int16_t i, j;
+#ifdef FIX_689_USAN_QSPHERICAL
+    uint16_t idx; 
+#else
     int16_t idx;
+#endif
 
     /* Quantize directions */
     q_direction->not_in_2D = 0;
@@ -169,8 +173,11 @@ void quantize_direction_frame2D(
     float elevation_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES] )
 {
     int16_t i, j;
+#ifdef FIX_689_USAN_QSPHERICAL
+    uint16_t idx;
+#else
     int16_t idx;
-
+#endif
     /* Quantize directions */
     q_direction->not_in_2D = 0;
     for ( i = q_direction->cfg.start_band; i < q_direction->cfg.nbands; i++ )
-- 
GitLab


From 00a4fb3f09ca31efb3e8319839666b7c0136ed49 Mon Sep 17 00:00:00 2001
From: Jouni Paulus <jouni.paulus@nokia.com>
Date: Fri, 11 Aug 2023 16:45:50 +0200
Subject: [PATCH 2/2] clang formatting

---
 lib_enc/ivas_qspherical_enc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib_enc/ivas_qspherical_enc.c b/lib_enc/ivas_qspherical_enc.c
index 2f918291c5..d97f9f59c6 100644
--- a/lib_enc/ivas_qspherical_enc.c
+++ b/lib_enc/ivas_qspherical_enc.c
@@ -65,7 +65,7 @@ void quantize_direction_frame(
 {
     int16_t i, j;
 #ifdef FIX_689_USAN_QSPHERICAL
-    uint16_t idx; 
+    uint16_t idx;
 #else
     int16_t idx;
 #endif
-- 
GitLab