From c4943885a1442c6c5d902b66ead971f08139c265 Mon Sep 17 00:00:00 2001
From: Vidhya V P <100825@ittiam.com>
Date: Mon, 24 Jul 2023 14:45:34 +0530
Subject: [PATCH 1/2] Fix for issue#624

---
 lib_com/options.h           | 1 +
 lib_enc/ivas_spar_encoder.c | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/lib_com/options.h b/lib_com/options.h
index b35772ecc1..7f752d7e7b 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -211,6 +211,7 @@
 #define FIX_622_SILENCE_USAN_WARNING                    /* FhG: silenceusan warning in ifft code */
 
 #define FIX_615_UBSAN_SPAR_TO_DIRAC                     /*Dlb : Fix for UBSAN issue 615*/
+#define FIX_624_PLANAR_SBA_WB                           /*Dlb : Fix for unintialised value issue 624 */
 /* ################## End BE DEVELOPMENT switches ######################### */
 
 
diff --git a/lib_enc/ivas_spar_encoder.c b/lib_enc/ivas_spar_encoder.c
index 7233234f49..c46141767c 100644
--- a/lib_enc/ivas_spar_encoder.c
+++ b/lib_enc/ivas_spar_encoder.c
@@ -433,6 +433,13 @@ static ivas_error ivas_spar_cov_md_process(
         {
             cov_real[i][j] = cov_real_buf[i][j];
             cov_dtx_real[i][j] = cov_dtx_real_buf[i][j];
+#ifdef FIX_624_PLANAR_SBA_WB
+            for ( b = hSpar->hFbMixer->pFb->filterbank_num_bands; b < IVAS_MAX_NUM_BANDS; b++ )
+            {
+                cov_real[i][j][b] = 0.0f;
+                cov_dtx_real[i][j][b] = 0.0f;
+            }
+#endif
         }
     }
 
-- 
GitLab


From eeef5c123d069bae466d9d251bb5c99fe64d226f Mon Sep 17 00:00:00 2001
From: Vidhya V P <100825@ittiam.com>
Date: Tue, 25 Jul 2023 13:09:43 +0530
Subject: [PATCH 2/2] Fix for issue#629

---
 lib_com/ivas_dirac_com.c | 4 ++++
 lib_com/options.h        | 1 +
 2 files changed, 5 insertions(+)

diff --git a/lib_com/ivas_dirac_com.c b/lib_com/ivas_dirac_com.c
index 504aea5d6c..35fadda709 100644
--- a/lib_com/ivas_dirac_com.c
+++ b/lib_com/ivas_dirac_com.c
@@ -385,7 +385,11 @@ void ivas_get_dirac_sba_max_md_bits(
         *bits_frame_nominal = (int16_t) ( sba_total_brate / FRAMES_PER_SEC );
         *metadata_max_bits = MAX16B; /* no limit */
     }
+#ifdef FIX_629_UBSAN_MD_MAX_BITS
+    *metadata_max_bits = (int16_t) min( (float) MAX16B, ceilf( (float) *metadata_max_bits * nbands / 5 ) );
+#else
     *metadata_max_bits = (int16_t) ceilf( (float) *metadata_max_bits * nbands / 5 );
+#endif
     *qmetadata_max_bit_req = QMETADATA_MAXBIT_REQ_SBA >> 1;
 
     return;
diff --git a/lib_com/options.h b/lib_com/options.h
index 7f752d7e7b..d4030b33ef 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -212,6 +212,7 @@
 
 #define FIX_615_UBSAN_SPAR_TO_DIRAC                     /*Dlb : Fix for UBSAN issue 615*/
 #define FIX_624_PLANAR_SBA_WB                           /*Dlb : Fix for unintialised value issue 624 */
+#define FIX_629_UBSAN_MD_MAX_BITS                       /*Dlb : Fix for UBSAN issue 629 for MD MAX bits calculation*/
 /* ################## End BE DEVELOPMENT switches ######################### */
 
 
-- 
GitLab