From 828e0c23e48bf58e5050094bf9bb6ff110d5f768 Mon Sep 17 00:00:00 2001
From: Tapani Pihlajakuja <tapani.pihlajakuja@nokia.com>
Date: Mon, 19 Jun 2023 08:46:42 +0300
Subject: [PATCH] Fix issue 566

---
 lib_com/options.h            |  1 +
 lib_dec/ivas_qmetadata_dec.c | 20 ++++++++++++++++++++
 lib_enc/ivas_qmetadata_enc.c | 29 +++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+)

diff --git a/lib_com/options.h b/lib_com/options.h
index 7350f8ec6e..335143c23e 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -158,6 +158,7 @@
 #define FIX_557_CRASH_IN_ISM_DTX                        /* VA issue 557: fix crash in 1ISM 48 kbps DTX */
 
 #define IGF_TUNING_96                                   /* FhG: Issue 546: slight tuning of IGF config used in 96 kbps stereo, 128 kbps SBA and others */
+#define FIX_566_2DIR_MASA_384K                          /* Nokia: Issued 566:  Bugfix in 384k MASA metadata encoding of second direction */
 
 /* ################## End DEVELOPMENT switches ######################### */
 /* clang-format on */
diff --git a/lib_dec/ivas_qmetadata_dec.c b/lib_dec/ivas_qmetadata_dec.c
index a9fc4693f0..4c7414555c 100644
--- a/lib_dec/ivas_qmetadata_dec.c
+++ b/lib_dec/ivas_qmetadata_dec.c
@@ -916,6 +916,25 @@ int16_t ivas_qmetadata_dec_decode_hr_384_512(
     }
     if ( hQMetaData->no_directions == 2 )
     {
+#ifdef FIX_566_2DIR_MASA_384K
+        float ratioSum;
+        for ( b = hQMetaData->q_direction[1].cfg.start_band; b < hQMetaData->q_direction[1].cfg.nbands; b++ )
+        {
+            for ( m = 0; m < hQMetaData->q_direction[1].cfg.nblocks; m++ )
+            {
+                hQMetaData->q_direction[1].band_data[b].energy_ratio[m] = 1.0f - diffuseness_reconstructions_hr[hQMetaData->q_direction[1].band_data[b].energy_ratio_index[m]];
+
+                /* Scale energy ratios that sum to over one */
+                ratioSum = hQMetaData->q_direction[0].band_data[b].energy_ratio[m] + hQMetaData->q_direction[1].band_data[b].energy_ratio[m];
+
+                if ( ratioSum > 1.0f )
+                {
+                    hQMetaData->q_direction[0].band_data[b].energy_ratio[m] /= ratioSum;
+                    hQMetaData->q_direction[1].band_data[b].energy_ratio[m] /= ratioSum;
+                }
+            }
+        }
+#else
         for ( b = hQMetaData->q_direction[1].cfg.start_band; b < hQMetaData->q_direction[1].cfg.nbands; b++ )
         {
             for ( m = 0; m < hQMetaData->q_direction[1].cfg.nblocks; m++ )
@@ -927,6 +946,7 @@ int16_t ivas_qmetadata_dec_decode_hr_384_512(
                 }
             }
         }
+#endif
     }
 
     if ( hQMetaData->no_directions == 2 )
diff --git a/lib_enc/ivas_qmetadata_enc.c b/lib_enc/ivas_qmetadata_enc.c
index ad34d810c1..e70cf79c5d 100644
--- a/lib_enc/ivas_qmetadata_enc.c
+++ b/lib_enc/ivas_qmetadata_enc.c
@@ -789,7 +789,24 @@ ivas_error ivas_qmetadata_enc_encode_hr_384_512(
         bits_no_dirs_coh +=
 #endif
             write_2dir_info( hMetaData, hQMetaData->twoDirBands, hQMetaData->q_direction[0].cfg.nbands, hQMetaData->numTwoDirBands );
+#ifdef FIX_566_2DIR_MASA_384K
+        d = 0;
+        for ( i = hQMetaData->q_direction[1].cfg.start_band; i < hQMetaData->q_direction[1].cfg.nbands; i++ )
+        {
+            if ( hQMetaData->twoDirBands[i] == 1 )
+            {
+                mvr2r( hQMetaData->q_direction[1].band_data[i].azimuth, hQMetaData->q_direction[1].band_data[d].azimuth, hQMetaData->q_direction[1].cfg.nblocks );
+                mvr2r( hQMetaData->q_direction[1].band_data[i].elevation, hQMetaData->q_direction[1].band_data[d].elevation, hQMetaData->q_direction[1].cfg.nblocks );
+                mvr2r( hQMetaData->q_direction[1].band_data[i].energy_ratio, hQMetaData->q_direction[1].band_data[d].energy_ratio, hQMetaData->q_direction[1].cfg.nblocks );
 
+                if ( hQMetaData->coherence_flag )
+                {
+                    mvc2c( hQMetaData->q_direction[1].coherence_band_data[i].spread_coherence, hQMetaData->q_direction[1].coherence_band_data[d].spread_coherence, hQMetaData->q_direction[1].cfg.nblocks );
+                }
+                d++;
+            }
+        }
+#endif
         for ( i = hQMetaData->numTwoDirBands; i < hQMetaData->q_direction[0].cfg.nbands; i++ )
         {
             set_f( hQMetaData->q_direction[1].band_data[i].energy_ratio, 0.0f, hQMetaData->q_direction[1].cfg.nblocks );
@@ -1537,6 +1554,9 @@ static void ivas_qmetadata_quantize_diffuseness_nrg_ratios_hr_512(
 
     if ( hQMetaData->no_directions == 2 )
     {
+#ifdef FIX_566_2DIR_MASA_384K
+        float ratioSum;
+#endif
         for ( j = hQMetaData->q_direction[1].cfg.start_band; j < hQMetaData->q_direction[1].cfg.nbands; ++j )
         {
             for ( k = 0; k < hQMetaData->q_direction[1].cfg.nblocks; k++ )
@@ -1545,10 +1565,19 @@ static void ivas_qmetadata_quantize_diffuseness_nrg_ratios_hr_512(
                 push_next_indice( hMetaData, index, MASA_BITS_ER_HR );
                 hQMetaData->q_direction[1].band_data[j].energy_ratio_index[k] = index;
                 hQMetaData->q_direction[1].band_data[j].energy_ratio[k] = 1.0f - diffuseness_reconstructions_hr[index];
+#ifdef FIX_566_2DIR_MASA_384K
+                ratioSum = hQMetaData->q_direction[0].band_data[j].energy_ratio[k] + hQMetaData->q_direction[1].band_data[j].energy_ratio[k];
+                if ( ratioSum > 1.0f )
+                {
+                    hQMetaData->q_direction[0].band_data[j].energy_ratio[k] /= ratioSum;
+                    hQMetaData->q_direction[1].band_data[j].energy_ratio[k] /= ratioSum;
+                }
+#else
                 if ( hQMetaData->q_direction[1].band_data[j].energy_ratio[k] > 1.0f - hQMetaData->q_direction[0].band_data[j].energy_ratio[k] )
                 {
                     hQMetaData->q_direction[1].band_data[j].energy_ratio[k] = 1.0f - hQMetaData->q_direction[0].band_data[j].energy_ratio[k];
                 }
+#endif
                 needed_bits[1] += MASA_BITS_ER_HR;
                 hQMetaData->q_direction[1].band_data[j].bits_sph_idx[k] = bits_dir_hr;
             }
-- 
GitLab