From 712b1129cca284f40f45e7512047888a71ff6fe7 Mon Sep 17 00:00:00 2001
From: vaclav <vaclav.eksler@usherbrooke.ca>
Date: Tue, 12 Aug 2025 14:36:21 +0200
Subject: [PATCH] port MR; under FIX_1121_MASA_DESCRIPTOR

---
 lib_com/ivas_rom_com.c      | 7 +++++++
 lib_com/ivas_rom_com.h      | 4 ++++
 lib_com/options.h           | 1 +
 lib_dec/ivas_masa_dec.c     | 2 ++
 lib_rend/ivas_mcmasa_ana.c  | 2 ++
 lib_util/masa_file_reader.c | 5 +++++
 6 files changed, 21 insertions(+)

diff --git a/lib_com/ivas_rom_com.c b/lib_com/ivas_rom_com.c
index 443e6190a..ba0189701 100644
--- a/lib_com/ivas_rom_com.c
+++ b/lib_com/ivas_rom_com.c
@@ -2471,6 +2471,13 @@ const uint16_t ivas_param_mc_sym_freq_ild_delta_combined_48_16bits[2 * PARAM_MC_
  * MASA ROM tables
  *----------------------------------------------------------------------------------*/
 
+#ifdef FIX_1121_MASA_DESCRIPTOR
+const uint8_t ivasmasaFormatDescriptor[8] = 
+{ 
+    0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 /* "IVASMASA" */
+};
+
+#endif
 const float diffuseness_reconstructions_hr[HR_MASA_ER_LEVELS] =
 {
      0.00f,
diff --git a/lib_com/ivas_rom_com.h b/lib_com/ivas_rom_com.h
index c73fbf38d..90816bc2c 100644
--- a/lib_com/ivas_rom_com.h
+++ b/lib_com/ivas_rom_com.h
@@ -264,6 +264,10 @@ extern const uint16_t ivas_param_mc_sym_freq_icc_delta_combined_48_16bits[2 * PA
  * MASA ROM tables
  *----------------------------------------------------------------------------------*/
 
+#ifdef FIX_1121_MASA_DESCRIPTOR
+extern const uint8_t ivasmasaFormatDescriptor[8]; /* "IVASMASA" */
+
+#endif
 extern const int16_t bits_direction_masa[DIRAC_DIFFUSE_LEVELS];
 extern const int16_t no_theta_masa[NO_SPHERICAL_GRIDS - 2];
 extern const int16_t no_phi_masa[NO_SPHERICAL_GRIDS][MAX_NO_THETA];
diff --git a/lib_com/options.h b/lib_com/options.h
index 218c6a4ab..af8713088 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -205,6 +205,7 @@
 #define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART             /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */
 #define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */
 #define NONBE_FIX_1052_SBA_EXT_FIX                      /* VA: SBA external output support fix - do not overwrite "output_config" parameter */
+#define FIX_1121_MASA_DESCRIPTOR                        /* VA: issue 1121: Define 'ivasmasaFormatDescriptor' at one common place */
 
 /* #################### End BASOP porting switches ############################ */
 
diff --git a/lib_dec/ivas_masa_dec.c b/lib_dec/ivas_masa_dec.c
index 0115d0c36..625a15b96 100644
--- a/lib_dec/ivas_masa_dec.c
+++ b/lib_dec/ivas_masa_dec.c
@@ -1891,7 +1891,9 @@ static void create_masa_ext_out_meta(
     IVAS_QMETADATA_HANDLE hQMetaData,
     const int16_t nchan_transport )
 {
+#ifndef FIX_1121_MASA_DESCRIPTOR
     const uint8_t ivasmasaFormatDescriptor[8] = { 0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 }; /* "IVASMASA" */
+#endif
     int16_t i, sf, b_old, b_new, dir;
     MASA_DECRIPTIVE_META *descMeta;
     int16_t *bandMap;
diff --git a/lib_rend/ivas_mcmasa_ana.c b/lib_rend/ivas_mcmasa_ana.c
index 5128eb969..b3f968ea3 100644
--- a/lib_rend/ivas_mcmasa_ana.c
+++ b/lib_rend/ivas_mcmasa_ana.c
@@ -1069,7 +1069,9 @@ void ivas_create_masa_out_meta(
     float surroundingCoherence[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS] /* i  : Estimated surround coherence    */
 )
 {
+#ifndef FIX_1121_MASA_DESCRIPTOR
     const uint8_t ivasmasaFormatDescriptor[8] = { 0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 }; /* "IVASMASA" */
+#endif
     int16_t i, sf, band;
     uint8_t numFrequencyBands;
     uint8_t numDirections;
diff --git a/lib_util/masa_file_reader.c b/lib_util/masa_file_reader.c
index b4a088d2c..d5e7f6874 100644
--- a/lib_util/masa_file_reader.c
+++ b/lib_util/masa_file_reader.c
@@ -35,6 +35,9 @@
 #include "ivas_stat_com.h"
 #include <stdlib.h>
 #include <math.h>
+#ifdef FIX_1121_MASA_DESCRIPTOR
+#include "ivas_rom_com.h" /* load 'ivasmasaFormatDescriptor[8]' */
+#endif
 
 
 struct MasaFileReader
@@ -111,7 +114,9 @@ ivas_error MasaFileReader_readNextFrame(
         return IVAS_ERR_UNEXPECTED_NULL_POINTER;
     }
 
+#ifndef FIX_1121_MASA_DESCRIPTOR
     const uint8_t ivasmasaFormatDescriptor[8] = { 0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 }; /* "IVASMASA" */
+#endif
     uint16_t twoByteBuffer = 0;
     int16_t i, j, b;
     IVAS_MASA_METADATA_HANDLE hMeta;
-- 
GitLab