From 619e2346bdcac9d7fa57e14d7cd9fb63cd53ac18 Mon Sep 17 00:00:00 2001
From: Vidhya V P <100825@ittiam.com>
Date: Thu, 15 Jun 2023 11:56:01 +0530
Subject: [PATCH 1/3] Removed the code related to planarCP = 1

---
 lib_com/ivas_prot.h                |  10 ++-
 lib_com/ivas_spar_com.c            |  21 +++--
 lib_com/ivas_spar_com_quant_util.c |  14 ++-
 lib_com/options.h                  |   1 +
 lib_dec/ivas_spar_md_dec.c         | 138 ++++++++++++++++++++++++-----
 lib_enc/ivas_spar_md_enc.c         | 136 +++++++++++++++++++++++-----
 6 files changed, 265 insertions(+), 55 deletions(-)

diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h
index 646d025ec3..ad7161e1b5 100644
--- a/lib_com/ivas_prot.h
+++ b/lib_com/ivas_prot.h
@@ -4489,8 +4489,11 @@ void ivas_calc_c_p_coeffs(
     const int16_t num_dmx,
     const int16_t band_idx,
     const int16_t dtx_vad,
-    const int16_t compute_p_flag,
+    const int16_t compute_p_flag
+#ifndef FIX_280_PLANAR_CP
+    ,
     const int16_t planarCP 
+#endif
 );
 
 void ivas_get_spar_md_from_dirac(
@@ -4957,8 +4960,11 @@ void ivas_copy_band_coeffs_idx_to_arr(
     const int16_t nB, 
     int16_t *pSymbol_re, 
     ivas_cell_dim_t *pCell_dims, 
-    const ivas_coeffs_type_t coeff_type,
+    const ivas_coeffs_type_t coeff_type
+#ifndef FIX_280_PLANAR_CP
+    ,
     const int16_t planarCP
+#endif
 );
 
 void ivas_clear_band_coeffs( 
diff --git a/lib_com/ivas_spar_com.c b/lib_com/ivas_spar_com.c
index c56421103d..59f976f4c9 100644
--- a/lib_com/ivas_spar_com.c
+++ b/lib_com/ivas_spar_com.c
@@ -1253,10 +1253,16 @@ void ivas_calc_c_p_coeffs(
     const int16_t num_dmx,
     const int16_t band_idx,
     const int16_t dtx_vad,
-    const int16_t compute_p_flag,
-    const int16_t planarCP )
+    const int16_t compute_p_flag
+#ifndef FIX_280_PLANAR_CP
+    ,
+    const int16_t planarCP
+#endif
+)
 {
+#ifndef FIX_280_PLANAR_CP
     int16_t i, j;
+#endif
     float postpred_cov_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH];
 
     if ( num_dmx != num_ch )
@@ -1267,7 +1273,7 @@ void ivas_calc_c_p_coeffs(
         {
             ivas_calc_c_coeffs_per_band( pSparMd, i_ts, postpred_cov_re, num_ch, num_dmx, band_idx, dtx_vad );
         }
-
+#ifndef FIX_280_PLANAR_CP
         if ( planarCP )
         {
             for ( i = 0; i < num_ch - num_dmx; i++ )
@@ -1281,12 +1287,12 @@ void ivas_calc_c_p_coeffs(
                 }
             }
         }
-
+#endif
         if ( compute_p_flag == 1 )
         {
             ivas_calc_p_coeffs_per_band( pSparMd, i_ts, postpred_cov_re, num_ch, dtx_vad, num_dmx, band_idx );
         }
-
+#ifndef FIX_280_PLANAR_CP
         if ( planarCP )
         {
             for ( i = num_dmx; i < num_ch; i++ )
@@ -1297,6 +1303,7 @@ void ivas_calc_c_p_coeffs(
                 }
             }
         }
+#endif
     }
 
     return;
@@ -1611,7 +1618,11 @@ void ivas_compute_spar_params(
 
         if ( ndm != num_ch )
         {
+#ifndef FIX_280_PLANAR_CP
             ivas_calc_c_p_coeffs( hSparMd, cov_real, i_ts, mixer_mat, num_ch, ndm, b, dtx_vad, 1, 0 );
+#else
+            ivas_calc_c_p_coeffs( hSparMd, cov_real, i_ts, mixer_mat, num_ch, ndm, b, dtx_vad, 1 );
+#endif
 
 #ifdef SPAR_HOA_DBG
             /* if (b == 0) */
diff --git a/lib_com/ivas_spar_com_quant_util.c b/lib_com/ivas_spar_com_quant_util.c
index 355e02ca76..018bf33818 100644
--- a/lib_com/ivas_spar_com_quant_util.c
+++ b/lib_com/ivas_spar_com_quant_util.c
@@ -243,11 +243,17 @@ void ivas_copy_band_coeffs_idx_to_arr(
     const int16_t nB,
     int16_t *pSymbol_re,
     ivas_cell_dim_t *pCell_dims,
-    const ivas_coeffs_type_t coeff_type,
-    const int16_t planarCP )
+    const ivas_coeffs_type_t coeff_type
+#ifndef FIX_280_PLANAR_CP
+    ,
+    const int16_t planarCP
+#endif
+)
 {
     int16_t i, len;
+#ifndef FIX_280_PLANAR_CP
     int16_t j, k;
+#endif
     int16_t *pPtr_idx = NULL;
 
     for ( i = 0; i < nB; i++ )
@@ -277,10 +283,13 @@ void ivas_copy_band_coeffs_idx_to_arr(
         len = pCell_dims[i].dim1 * pCell_dims[i].dim2;
         if ( ( coeff_type != DECX_COEFF ) )
         {
+#ifndef FIX_280_PLANAR_CP
             if ( ( coeff_type == PRED_COEFF ) || !planarCP )
             {
+#endif
                 mvs2s( pPtr_idx, pSymbol_re, len );
                 pSymbol_re += len;
+#ifndef FIX_280_PLANAR_CP
             }
             else
             {
@@ -295,6 +304,7 @@ void ivas_copy_band_coeffs_idx_to_arr(
                 }
                 pSymbol_re += k;
             }
+#endif
         }
     }
 
diff --git a/lib_com/options.h b/lib_com/options.h
index a0864dee37..c5900869ab 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -153,6 +153,7 @@
 #define FIX_383_CLEAN_UP                                /* Dlb : Clean up of unused functions */
 // #define FIX_532_ISM_MD_INACTIVE                         /* VA: issue 532: improve MD coding in ISM inactive frames */
 #define FIX_547_NAN_IGF_DEC                             /* FhG: issue 547: fix possible nan in IGF decoder */
+#define FIX_280_PLANAR_CP                               /* Dlb : fix issue 28 : remove planarCP=1 related code*/
 
 
 /* ################## End DEVELOPMENT switches ######################### */
diff --git a/lib_dec/ivas_spar_md_dec.c b/lib_dec/ivas_spar_md_dec.c
index 92e18c5c2c..2c212352d6 100644
--- a/lib_dec/ivas_spar_md_dec.c
+++ b/lib_dec/ivas_spar_md_dec.c
@@ -63,13 +63,21 @@ static const int16_t ivas_spar_dec_plc_spatial_target[IVAS_SPAR_MAX_CH] = { 1, 0
  *------------------------------------------------------------------------------------------*/
 
 static void ivas_get_spar_matrices( ivas_spar_md_dec_state_t *hMdDec, const int16_t num_bands_out, const int16_t n_ts, const int16_t bw, const int16_t dtx_vad, const int16_t nB, const int16_t numch_out, const int16_t active_w_vlbr );
-
+#ifndef FIX_280_PLANAR_CP
 static void ivas_decode_arith_bs( ivas_spar_md_dec_state_t *hMdDec, Decoder_State *st, const uint16_t qsi, const int16_t nB, const int16_t bands_bw, int16_t *pDo_diff, const int16_t freq_diff, const int16_t planarCP, const int16_t strat, const int32_t ivas_total_brate );
 
 static void ivas_decode_huffman_bs( ivas_spar_md_dec_state_t *hMdDec, Decoder_State *st, const uint16_t qsi, const int16_t nB, const int16_t bands_bw, const int16_t planarCP );
 
 static void ivas_fill_band_coeffs_idx( ivas_band_coeffs_ind_t *pBands_idx, const int16_t nB, int16_t *pSymbol_re, ivas_cell_dim_t *pCell_dims, ivas_coeffs_type_t coeff_type, const int16_t planarCP );
 
+#else
+static void ivas_decode_arith_bs( ivas_spar_md_dec_state_t *hMdDec, Decoder_State *st, const uint16_t qsi, const int16_t nB, const int16_t bands_bw, int16_t *pDo_diff, const int16_t freq_diff, const int16_t strat, const int32_t ivas_total_brate );
+
+static void ivas_decode_huffman_bs( ivas_spar_md_dec_state_t *hMdDec, Decoder_State *st, const uint16_t qsi, const int16_t nB, const int16_t bands_bw );
+
+static void ivas_fill_band_coeffs_idx( ivas_band_coeffs_ind_t *pBands_idx, const int16_t nB, int16_t *pSymbol_re, ivas_cell_dim_t *pCell_dims, ivas_coeffs_type_t coeff_type );
+
+#endif
 static void ivas_get_band_idx_from_differential( ivas_spar_md_t *pSpar_md, const int16_t q_levels[2], const int16_t one_sided, const int16_t nB, const ivas_coeffs_type_t coeff_type );
 
 static void ivas_mat_col_rearrange( float in_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], const int16_t order[IVAS_SPAR_MAX_CH], const int16_t i_ts, float ***mixer_mat, const int16_t bands, const int16_t num_ch );
@@ -84,7 +92,12 @@ static void ivas_parse_parameter_bitstream_dtx( ivas_spar_md_t *pSpar_md, Decode
 
 static ivas_error ivas_deindex_real_index( const int16_t *index, const int16_t q_levels, const float min_value, const float max_value, float *quant, const int16_t num_ch_dim2 );
 
+#ifndef FIX_280_PLANAR_CP
 static void ivas_spar_dec_parse_md_bs( ivas_spar_md_dec_state_t *hMdDec, Decoder_State *st, int16_t *nB, int16_t *bands_bw, int16_t *dtx_vad, const int32_t ivas_total_brate, const int16_t use_planar_coeff, const int16_t sba_inactive_mode, const int32_t last_active_brate );
+#else
+static void ivas_spar_dec_parse_md_bs( ivas_spar_md_dec_state_t *hMdDec, Decoder_State *st, int16_t *nB, int16_t *bands_bw, int16_t *dtx_vad, const int32_t ivas_total_brate, const int16_t sba_inactive_mode, const int32_t last_active_brate );
+
+#endif
 
 
 /*-------------------------------------------------------------------------
@@ -675,8 +688,10 @@ void ivas_spar_md_dec_process(
 
 
     ivas_spar_dec_parse_md_bs( hMdDec, st0, &nB, &bw, &dtx_vad, st_ivas->hDecoderConfig->ivas_total_brate,
-                               ivas_spar_br_table_consts[hMdDec->table_idx].usePlanarCoeff, st_ivas->hQMetaData->sba_inactive_mode,
-                               st_ivas->last_active_ivas_total_brate );
+#ifndef FIX_280_PLANAR_CP
+                               ivas_spar_br_table_consts[hMdDec->table_idx].usePlanarCoeff,
+#endif
+                               st_ivas->hQMetaData->sba_inactive_mode, st_ivas->last_active_ivas_total_brate );
 
 #if 0
     {
@@ -1697,7 +1712,9 @@ static void ivas_spar_dec_parse_md_bs(
     int16_t *bands_bw,
     int16_t *dtx_vad,
     const int32_t ivas_total_brate,
+#ifndef FIX_280_PLANAR_CP
     const int16_t use_planar_coeff,
+#endif
     const int16_t sba_inactive_mode,
     const int32_t last_active_brate )
 {
@@ -1707,7 +1724,9 @@ static void ivas_spar_dec_parse_md_bs(
     ivas_quant_strat_t qs;
     int16_t strat, freq_diff, no_ec;
     int16_t do_diff[IVAS_MAX_NUM_BANDS];
+#ifndef FIX_280_PLANAR_CP
     int16_t planarCP;
+#endif
     float quant[IVAS_SPAR_MAX_C_COEFF];
     int16_t do_repeat[IVAS_MAX_NUM_BANDS];
     int16_t bw_final, bw_fact;
@@ -1819,7 +1838,7 @@ static void ivas_spar_dec_parse_md_bs(
     }
 
     qs = hMdDec->spar_md_cfg.quant_strat[qsi];
-
+#ifndef FIX_280_PLANAR_CP
     planarCP = 0;
     if ( ( qsi == 2 ) && ( use_planar_coeff ) )
     {
@@ -1828,6 +1847,7 @@ static void ivas_spar_dec_parse_md_bs(
         fprintf( stdout, "planarCP = 1\n" );
 #endif
     }
+#endif
     strat = get_next_indice( st0, 3 );
 
 #ifdef SPAR_HOA_DBG
@@ -1888,12 +1908,20 @@ static void ivas_spar_dec_parse_md_bs(
 
     if ( no_ec == 0 )
     {
-        ivas_decode_arith_bs( hMdDec, st0, qsi, *nB, *bands_bw, do_diff, freq_diff, planarCP,
+        ivas_decode_arith_bs( hMdDec, st0, qsi, *nB, *bands_bw, do_diff, freq_diff,
+#ifndef FIX_280_PLANAR_CP
+                              planarCP,
+#endif
                               strat, ivas_total_brate );
     }
     else
     {
-        ivas_decode_huffman_bs( hMdDec, st0, qsi, *nB, *bands_bw, planarCP );
+        ivas_decode_huffman_bs( hMdDec, st0, qsi, *nB, *bands_bw
+#ifndef FIX_280_PLANAR_CP
+                                ,
+                                planarCP
+#endif
+        );
     }
 
     for ( i = 0; i < *nB; i++ )
@@ -2036,7 +2064,9 @@ static void ivas_decode_arith_bs(
     const int16_t bands_bw,
     int16_t *pDo_diff,
     const int16_t freq_diff,
+#ifndef FIX_280_PLANAR_CP
     const int16_t planarCP,
+#endif
     const int16_t strat,
     const int32_t ivas_total_brate )
 {
@@ -2111,13 +2141,23 @@ static void ivas_decode_arith_bs(
                 }
             }
         }
-        ivas_copy_band_coeffs_idx_to_arr( hMdDec->spar_md_prev.band_coeffs_idx_mapped, nB, symbol_arr_old_re, pred_cell_dims, PRED_COEFF, planarCP );
+        ivas_copy_band_coeffs_idx_to_arr( hMdDec->spar_md_prev.band_coeffs_idx_mapped, nB, symbol_arr_old_re, pred_cell_dims, PRED_COEFF
+#ifndef FIX_280_PLANAR_CP
+                                          ,
+                                          planarCP
+#endif
+        );
     }
 
     ivas_arith_decode_cmplx_cell_array( &hMdDec->arith_coeffs.pred_arith_re[qsi], &hMdDec->arith_coeffs.pred_arith_re_diff[qsi],
                                         st0, pred_cell_dims, pDo_diff, nB, symbol_arr_re, symbol_arr_old_re );
 
-    ivas_fill_band_coeffs_idx( hMdDec->spar_md.band_coeffs_idx, nB, symbol_arr_re, pred_cell_dims, PRED_COEFF, planarCP );
+    ivas_fill_band_coeffs_idx( hMdDec->spar_md.band_coeffs_idx, nB, symbol_arr_re, pred_cell_dims, PRED_COEFF
+#ifndef FIX_280_PLANAR_CP
+                               ,
+                               planarCP
+#endif
+    );
 
     if ( hMdDec->spar_hoa_md_flag && hMdDec->spar_hoa_dirac2spar_md_flag )
     {
@@ -2140,9 +2180,14 @@ static void ivas_decode_arith_bs(
 
     if ( any_diff == 1 )
     {
-        ivas_copy_band_coeffs_idx_to_arr( hMdDec->spar_md_prev.band_coeffs_idx_mapped, nB, symbol_arr_old_re, drct_cell_dims, DRCT_COEFF, planarCP );
+        ivas_copy_band_coeffs_idx_to_arr( hMdDec->spar_md_prev.band_coeffs_idx_mapped, nB, symbol_arr_old_re, drct_cell_dims, DRCT_COEFF
+#ifndef FIX_280_PLANAR_CP
+                                          ,
+                                          planarCP
+#endif
+        );
     }
-
+#ifndef FIX_280_PLANAR_CP
     if ( planarCP )
     {
         for ( i = 0; i < nB; i++ )
@@ -2150,17 +2195,27 @@ static void ivas_decode_arith_bs(
             drct_cell_dims[i].dim1 = drct_cell_dims[i].dim1 - IVAS_SPAR_HOA3_NP_CHS;
         }
     }
-
+#endif
     ivas_arith_decode_cmplx_cell_array( &hMdDec->arith_coeffs.drct_arith_re[qsi], &hMdDec->arith_coeffs.drct_arith_re_diff[qsi],
                                         st0, drct_cell_dims, pDo_diff, nB, symbol_arr_re, symbol_arr_old_re );
 
-    ivas_fill_band_coeffs_idx( hMdDec->spar_md.band_coeffs_idx, nB, symbol_arr_re, drct_cell_dims, DRCT_COEFF, planarCP );
+    ivas_fill_band_coeffs_idx( hMdDec->spar_md.band_coeffs_idx, nB, symbol_arr_re, drct_cell_dims, DRCT_COEFF
+#ifndef FIX_280_PLANAR_CP
+                               ,
+                               planarCP
+#endif
+    );
 
     if ( any_diff == 1 )
     {
-        ivas_copy_band_coeffs_idx_to_arr( hMdDec->spar_md_prev.band_coeffs_idx_mapped, nB, symbol_arr_old_re, decd_cell_dims, DECD_COEFF, planarCP );
+        ivas_copy_band_coeffs_idx_to_arr( hMdDec->spar_md_prev.band_coeffs_idx_mapped, nB, symbol_arr_old_re, decd_cell_dims, DECD_COEFF
+#ifndef FIX_280_PLANAR_CP
+                                          ,
+                                          planarCP
+#endif
+        );
     }
-
+#ifndef FIX_280_PLANAR_CP
     if ( planarCP )
     {
         for ( i = 0; i < nB; i++ )
@@ -2168,18 +2223,33 @@ static void ivas_decode_arith_bs(
             decd_cell_dims[i].dim1 = decd_cell_dims[i].dim1 - IVAS_SPAR_HOA3_NP_CHS;
         }
     }
-
+#endif
     ivas_arith_decode_cmplx_cell_array( &hMdDec->arith_coeffs.decd_arith_re[qsi], &hMdDec->arith_coeffs.decd_arith_re_diff[qsi],
                                         st0, decd_cell_dims, pDo_diff, nB, symbol_arr_re, symbol_arr_old_re );
 
-    ivas_fill_band_coeffs_idx( hMdDec->spar_md.band_coeffs_idx, nB, symbol_arr_re, decd_cell_dims, DECD_COEFF, planarCP );
+    ivas_fill_band_coeffs_idx( hMdDec->spar_md.band_coeffs_idx, nB, symbol_arr_re, decd_cell_dims, DECD_COEFF
+#ifndef FIX_280_PLANAR_CP
+                               ,
+                               planarCP
+#endif
+    );
 
     if ( any_diff == 1 )
     {
-        ivas_copy_band_coeffs_idx_to_arr( hMdDec->spar_md_prev.band_coeffs_idx_mapped, nB, symbol_arr_old_re, decx_cell_dims, DECX_COEFF, planarCP );
+        ivas_copy_band_coeffs_idx_to_arr( hMdDec->spar_md_prev.band_coeffs_idx_mapped, nB, symbol_arr_old_re, decx_cell_dims, DECX_COEFF
+#ifndef FIX_280_PLANAR_CP
+                                          ,
+                                          planarCP
+#endif
+        );
     }
 
-    ivas_fill_band_coeffs_idx( hMdDec->spar_md.band_coeffs_idx, nB, symbol_arr_re, decx_cell_dims, DECX_COEFF, planarCP );
+    ivas_fill_band_coeffs_idx( hMdDec->spar_md.band_coeffs_idx, nB, symbol_arr_re, decx_cell_dims, DECX_COEFF
+#ifndef FIX_280_PLANAR_CP
+                               ,
+                               planarCP
+#endif
+    );
 
     if ( freq_diff == 1 )
     {
@@ -2291,10 +2361,18 @@ static void ivas_fill_band_coeffs_idx(
     const int16_t nB,
     int16_t *pSymbol_re,
     ivas_cell_dim_t *pCell_dims,
-    const ivas_coeffs_type_t coeff_type,
-    const int16_t planarCP )
+    const ivas_coeffs_type_t coeff_type
+#ifndef FIX_280_PLANAR_CP
+    ,
+    const int16_t planarCP
+#endif
+)
 {
+#ifndef FIX_280_PLANAR_CP
     int16_t i, j, k, len;
+#else
+    int16_t i, len;
+#endif
     int16_t *pPtr_idx = NULL;
 
     for ( i = 0; i < nB; i++ )
@@ -2327,11 +2405,14 @@ static void ivas_fill_band_coeffs_idx(
 
         if ( coeff_type != DECX_COEFF )
         {
+#ifndef FIX_280_PLANAR_CP
             if ( ( coeff_type == PRED_COEFF ) || !planarCP )
             {
+#endif
                 len = pCell_dims[i].dim1 * pCell_dims[i].dim2;
                 mvs2s( pSymbol_re, pPtr_idx, len );
                 pSymbol_re += len;
+#ifndef FIX_280_PLANAR_CP
             }
             else
             {
@@ -2351,6 +2432,7 @@ static void ivas_fill_band_coeffs_idx(
                 }
                 pSymbol_re += k;
             }
+#endif
         }
     }
 
@@ -2369,8 +2451,12 @@ static void ivas_decode_huffman_bs(
     Decoder_State *st0, /* i/o: decoder state structure - for bitstream handling*/
     const uint16_t qsi,
     const int16_t nB,
-    const int16_t bands_bw,
-    const int16_t planarCP )
+    const int16_t bands_bw
+#ifndef FIX_280_PLANAR_CP
+    ,
+    const int16_t planarCP
+#endif
+)
 {
     int16_t i, j;
     int16_t ndm, ndec;
@@ -2412,26 +2498,34 @@ static void ivas_decode_huffman_bs(
 
         for ( j = 0; j < drct_dim; j++ )
         {
+#ifndef FIX_280_PLANAR_CP
             if ( planarCP && !keep_planar[(int16_t) floor( j / ( ndm - 1 ) )] )
             {
                 hMdDec->spar_md.band_coeffs_idx[i].drct_index_re[j] = 0;
             }
             else
             {
+#endif
                 ivas_huffman_decode( &hMdDec->huff_coeffs.drct_huff_re[qsi], st0, &hMdDec->spar_md.band_coeffs_idx[i].drct_index_re[j] );
+#ifndef FIX_280_PLANAR_CP
             }
+#endif
         }
 
         for ( j = 0; j < decd_dim; j++ )
         {
+#ifndef FIX_280_PLANAR_CP
             if ( planarCP && !keep_planar[j] )
             {
                 hMdDec->spar_md.band_coeffs_idx[i].decd_index_re[j] = 0;
             }
             else
             {
+#endif
                 ivas_huffman_decode( &hMdDec->huff_coeffs.decd_huff_re[qsi], st0, &hMdDec->spar_md.band_coeffs_idx[i].decd_index_re[j] );
+#ifndef FIX_280_PLANAR_CP
             }
+#endif
         }
     }
 
diff --git a/lib_enc/ivas_spar_md_enc.c b/lib_enc/ivas_spar_md_enc.c
index dbca3809cc..bd2f817b48 100644
--- a/lib_enc/ivas_spar_md_enc.c
+++ b/lib_enc/ivas_spar_md_enc.c
@@ -72,18 +72,28 @@ static void ivas_band_mixer( float *cov_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
 #ifndef FIX_383_CLEAN_UP
 static void ivas_get_band_differential_index( ivas_band_coeffs_ind_t *pBand_idx, const int16_t q_levels[2], const int16_t one_sided, const int16_t nB, const int16_t complex_cov, const int16_t dim, const ivas_coeffs_type_t coeff_type );
 #endif
-
-static int16_t ivas_get_huffman_coded_bs( ivas_spar_md_enc_state_t *hMdEnc, BSTR_ENC_HANDLE hMetaData, const int16_t nB, const int16_t qsi, const int16_t planarCP, const int16_t bands_bw );
+static int16_t ivas_get_huffman_coded_bs( ivas_spar_md_enc_state_t *hMdEnc, BSTR_ENC_HANDLE hMetaData, const int16_t nB, const int16_t qsi,
+#ifndef FIX_280_PLANAR_CP
+                                          const int16_t planarCP,
+#endif
+                                          const int16_t bands_bw );
+#ifndef FIX_280_PLANAR_CP
 static int16_t ivas_get_arith_coded_bs( ivas_spar_md_enc_state_t *hMdEnc, BSTR_ENC_HANDLE hMetaData, const int16_t *pDo_diff, const int16_t bands_bw, const int16_t nB, const int16_t qsi, const int16_t planarCP, const int16_t strat, const int32_t ivas_total_brate );
+#else
 
+static int16_t ivas_get_arith_coded_bs( ivas_spar_md_enc_state_t *hMdEnc, BSTR_ENC_HANDLE hMetaData, const int16_t *pDo_diff, const int16_t bands_bw, const int16_t nB, const int16_t qsi, const int16_t strat, const int32_t ivas_total_brate );
+
+#endif
 static ivas_error ivas_spar_set_enc_config( ivas_spar_md_enc_state_t *hMdEnc, int16_t *max_freq_per_chan, const int16_t nchan_transport, float *pFC, const int16_t nchan_inp );
 
 static void ivas_select_next_strat( ivas_strats_t prior_strat, ivas_strats_t cs[MAX_QUANT_STRATS], const int16_t dmx_switch, const int16_t dtx_vad );
 
 static void ivas_store_prior_coeffs( ivas_spar_md_enc_state_t *hMdEnc, const int16_t num_bands, const int16_t strat, const int16_t dtx_vad, const int16_t qsi );
-
+#ifndef FIX_280_PLANAR_CP
 static void ivas_write_spar_md_bitstream( ivas_spar_md_enc_state_t *hMdEnc, const int16_t nB, const int16_t bands_bw, BSTR_ENC_HANDLE hMetaData, const int32_t ivas_total_brate, const int16_t strat, const int16_t qsi, const int16_t planarCP );
-
+#else
+static void ivas_write_spar_md_bitstream( ivas_spar_md_enc_state_t *hMdEnc, const int16_t nB, const int16_t bands_bw, BSTR_ENC_HANDLE hMetaData, const int32_t ivas_total_brate, const int16_t strat, const int16_t qsi );
+#endif
 static void ivas_spar_quant_pred_coeffs_dtx( ivas_spar_md_t *pSpar_md, const float *pValues, const int16_t ndm, int16_t *pIndex, const int16_t dim1, float *pQuant );
 
 static void ivas_quant_p_per_band_dtx( float *pP_mat, const int16_t num_dec, const int16_t num_dmx, int16_t *ppIdx_pd, float *pP_out, const int16_t num_ch );
@@ -571,7 +581,9 @@ ivas_error ivas_spar_md_enc_process(
     float pred_coeffs_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS];
     float dm_fv_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS];
     int16_t i, j, b, qsi, ndm, ndec, num_ch, num_quant_strats;
+#ifndef FIX_280_PLANAR_CP
     int16_t planarCP;
+#endif
     float pred_coeffs_re_local[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS];
     int16_t k, bwidth, num_bands, num_bands_full, num_bands_bw;
     int16_t active_w, nchan_transport, dmx_switch, strat;
@@ -709,7 +721,9 @@ ivas_error ivas_spar_md_enc_process(
 #ifdef DEBUG_LBR_SBA
     float dirac_md_kbps = (float) ( hMetaData->nb_bits_tot ) * 50 / 1000;
 #endif
+#ifndef FIX_280_PLANAR_CP
     planarCP = 0;
+#endif
     code_strat = 0;
 #ifdef DEBUG_SBA_MD_DUMP
     ndec = -1;
@@ -723,6 +737,7 @@ ivas_error ivas_spar_md_enc_process(
 #ifdef SPAR_HOA_DBG
         fprintf( stdout, "qsi = %d\n", qsi );
 #endif
+#ifndef FIX_280_PLANAR_CP
         if ( qsi == 2 && ivas_spar_br_table_consts[hMdEnc->table_idx].usePlanarCoeff )
         {
             planarCP = 1;
@@ -747,6 +762,7 @@ ivas_error ivas_spar_md_enc_process(
                 }
             }
         }
+#endif
         for ( b = 0; b < num_bands; b++ )
         {
             ndm = hMdEnc->spar_md_cfg.num_dmx_chans_per_band[b * bands_bw];
@@ -770,7 +786,7 @@ ivas_error ivas_spar_md_enc_process(
                     fprintf(stderr, "\n\n"); */
 #endif
 
-
+#ifndef FIX_280_PLANAR_CP
                     if ( planarCP )
                     {
                         for ( i = 0; i < ndec; i++ )
@@ -793,6 +809,7 @@ ivas_error ivas_spar_md_enc_process(
                         fprintf(stderr, "\n\n"); */
 #endif
                     }
+#endif
                     ivas_quant_p_per_band( &hMdEnc->spar_md.band_coeffs[b], &hMdEnc->spar_md.band_coeffs_idx[b], &hMdEnc->spar_md_cfg.quant_strat[qsi], num_ch );
                 }
                 ivas_quant_pred_coeffs_per_band( &hMdEnc->spar_md.band_coeffs[b], &hMdEnc->spar_md.band_coeffs_idx[b], &hMdEnc->spar_md_cfg.quant_strat[qsi], num_ch );
@@ -885,7 +902,12 @@ ivas_error ivas_spar_md_enc_process(
 
             if ( ( ndm != num_ch ) && ( ndm != 1 ) )
             {
-                ivas_calc_c_p_coeffs( &hMdEnc->spar_md, cov_real, 0, hMdEnc->mixer_mat, num_ch, ndm, b, dtx_vad, 0, planarCP );
+                ivas_calc_c_p_coeffs( &hMdEnc->spar_md, cov_real, 0, hMdEnc->mixer_mat, num_ch, ndm, b, dtx_vad, 0
+#ifndef FIX_280_PLANAR_CP
+                                      ,
+                                      planarCP
+#endif
+                );
 #ifdef SPAR_HOA_DBG
                 /*fprintf(stderr, "\n\n C coefficients: band %d\n", b);
 
@@ -899,6 +921,7 @@ ivas_error ivas_spar_md_enc_process(
                 }
                 fprintf(stderr, "\n\n"); */
 #endif
+#ifndef FIX_280_PLANAR_CP
                 if ( planarCP )
                 {
                     for ( i = 0; i < num_ch - ndm; i++ )
@@ -925,7 +948,7 @@ ivas_error ivas_spar_md_enc_process(
                     fprintf(stderr, "\n\n"); */
 #endif
                 }
-
+#endif
                 ivas_quant_c_per_band( &hMdEnc->spar_md.band_coeffs[b], &hMdEnc->spar_md.band_coeffs_idx[b],
                                        &hMdEnc->spar_md_cfg.quant_strat[qsi], ndec, ndm );
 #ifdef SPAR_HOA_DBG
@@ -964,7 +987,12 @@ ivas_error ivas_spar_md_enc_process(
             {
                 reset_indices_enc( &hMetaData_tmp, md_indices_allocated );
 
-                ivas_write_spar_md_bitstream( hMdEnc, num_bands, bands_bw, &hMetaData_tmp, hEncoderConfig->ivas_total_brate, strat, qsi, planarCP );
+                ivas_write_spar_md_bitstream( hMdEnc, num_bands, bands_bw, &hMetaData_tmp, hEncoderConfig->ivas_total_brate, strat, qsi
+#ifndef FIX_280_PLANAR_CP
+                                              ,
+                                              planarCP
+#endif
+                );
 
                 /*write to main buffer if its a valid bitstream*/
                 if ( hMetaData_tmp.nb_bits_tot > 0 )
@@ -1320,8 +1348,12 @@ static void ivas_write_spar_md_bitstream(
     BSTR_ENC_HANDLE hMetaData,
     const int32_t ivas_total_brate,
     const int16_t strat,
-    const int16_t qsi,
-    const int16_t planarCP )
+    const int16_t qsi
+#ifndef FIX_280_PLANAR_CP
+    ,
+    const int16_t planarCP
+#endif
+)
 {
     int16_t no_ec, i;
     int16_t do_diff[IVAS_MAX_NUM_BANDS];
@@ -1431,12 +1463,20 @@ static void ivas_write_spar_md_bitstream(
     if ( no_ec == 1 )
     {
         entropy_coding_result =
-            ivas_get_huffman_coded_bs( hMdEnc, hMetaData, nB, qsi, planarCP, bands_bw );
+            ivas_get_huffman_coded_bs( hMdEnc, hMetaData, nB, qsi,
+#ifndef FIX_280_PLANAR_CP
+                                       planarCP,
+#endif
+                                       bands_bw );
     }
     else
     {
         entropy_coding_result =
-            ivas_get_arith_coded_bs( hMdEnc, hMetaData, do_diff, bands_bw, nB, qsi, planarCP, strat, ivas_total_brate );
+            ivas_get_arith_coded_bs( hMdEnc, hMetaData, do_diff, bands_bw, nB, qsi,
+#ifndef FIX_280_PLANAR_CP
+                                     planarCP,
+#endif
+                                     strat, ivas_total_brate );
     }
 
     if ( entropy_coding_result < 0 )
@@ -1458,7 +1498,9 @@ static int16_t ivas_get_huffman_coded_bs(
     BSTR_ENC_HANDLE hMetaData,
     const int16_t nB,
     const int16_t qsi,
+#ifndef FIX_280_PLANAR_CP
     const int16_t planarCP,
+#endif
     const int16_t bands_bw )
 {
     int16_t i, j;
@@ -1480,7 +1522,7 @@ static int16_t ivas_get_huffman_coded_bs(
                 pred_offset = DIRAC_TO_SPAR_HBR_PRED_CHS;
             }
         }
-
+#ifndef FIX_280_PLANAR_CP
         if ( planarCP )
         {
             for ( j = pred_offset; j < pred_coeff_dim; j++ )
@@ -1521,6 +1563,7 @@ static int16_t ivas_get_huffman_coded_bs(
         }
         else
         {
+#endif
             for ( j = pred_offset; j < pred_coeff_dim; j++ )
             {
                 ivas_huffman_encode( &hMdEnc->huff_coeffs.pred_huff_re[qsi], hMdEnc->spar_md.band_coeffs_idx[i].pred_index_re[j], &code, &len );
@@ -1550,7 +1593,9 @@ static int16_t ivas_get_huffman_coded_bs(
                 }
                 push_next_indice( hMetaData, code, len );
             }
+#ifndef FIX_280_PLANAR_CP
         }
+#endif
     }
 
     return 0;
@@ -1569,7 +1614,9 @@ static int16_t ivas_get_arith_coded_bs(
     const int16_t bands_bw,
     const int16_t nB,
     const int16_t qsi,
+#ifndef FIX_280_PLANAR_CP
     const int16_t planarCP,
+#endif
     const int16_t strat,
     const int32_t ivas_total_brate )
 {
@@ -1649,11 +1696,21 @@ static int16_t ivas_get_arith_coded_bs(
             }
         }
     }
-    ivas_copy_band_coeffs_idx_to_arr( hMdEnc->spar_md.band_coeffs_idx, nB, symbol_arr_re, pred_cell_dims, PRED_COEFF, planarCP );
+    ivas_copy_band_coeffs_idx_to_arr( hMdEnc->spar_md.band_coeffs_idx, nB, symbol_arr_re, pred_cell_dims, PRED_COEFF
+#ifndef FIX_280_PLANAR_CP
+                                      ,
+                                      planarCP
+#endif
+    );
 
     if ( any_diff == 1 )
     {
-        ivas_copy_band_coeffs_idx_to_arr( hMdEnc->spar_md_prior.band_coeffs_idx_mapped, nB, symbol_arr_old_re, pred_cell_dims, PRED_COEFF, planarCP );
+        ivas_copy_band_coeffs_idx_to_arr( hMdEnc->spar_md_prior.band_coeffs_idx_mapped, nB, symbol_arr_old_re, pred_cell_dims, PRED_COEFF
+#ifndef FIX_280_PLANAR_CP
+                                          ,
+                                          planarCP
+#endif
+        );
     }
 
     arith_result = ivas_arith_encode_cmplx_cell_array( &hMdEnc->arith_coeffs.pred_arith_re[qsi], &hMdEnc->arith_coeffs.pred_arith_re_diff[qsi], pDo_diff, nB,
@@ -1688,13 +1745,23 @@ static int16_t ivas_get_arith_coded_bs(
             fprintf(stderr, "%d, ", hMdEnc->spar_md.band_coeffs_idx[0].drct_index_re[j]);
     fprintf(stderr, "\n\n"); */
 #endif
-    ivas_copy_band_coeffs_idx_to_arr( hMdEnc->spar_md.band_coeffs_idx, nB, symbol_arr_re, drct_cell_dims, DRCT_COEFF, planarCP );
+    ivas_copy_band_coeffs_idx_to_arr( hMdEnc->spar_md.band_coeffs_idx, nB, symbol_arr_re, drct_cell_dims, DRCT_COEFF
+#ifndef FIX_280_PLANAR_CP
+                                      ,
+                                      planarCP
+#endif
+    );
 
     if ( any_diff == 1 )
     {
-        ivas_copy_band_coeffs_idx_to_arr( hMdEnc->spar_md_prior.band_coeffs_idx_mapped, nB, symbol_arr_old_re, drct_cell_dims, DRCT_COEFF, planarCP );
+        ivas_copy_band_coeffs_idx_to_arr( hMdEnc->spar_md_prior.band_coeffs_idx_mapped, nB, symbol_arr_old_re, drct_cell_dims, DRCT_COEFF
+#ifndef FIX_280_PLANAR_CP
+                                          ,
+                                          planarCP
+#endif
+        );
     }
-
+#ifndef FIX_280_PLANAR_CP
     if ( planarCP )
     {
         for ( i = 0; i < nB; i++ )
@@ -1702,7 +1769,7 @@ static int16_t ivas_get_arith_coded_bs(
             drct_cell_dims[i].dim1 = drct_cell_dims[i].dim1 - IVAS_SPAR_HOA3_NP_CHS;
         }
     }
-
+#endif
     arith_result = ivas_arith_encode_cmplx_cell_array( &hMdEnc->arith_coeffs.drct_arith_re[qsi], &hMdEnc->arith_coeffs.drct_arith_re_diff[qsi], pDo_diff, nB,
                                                        symbol_arr_re, symbol_arr_old_re, drct_cell_dims, hMetaData, any_diff, hMdEnc->spar_md_cfg.max_bits_per_blk );
     if ( arith_result < 0 )
@@ -1710,13 +1777,23 @@ static int16_t ivas_get_arith_coded_bs(
         return -1;
     }
 
-    ivas_copy_band_coeffs_idx_to_arr( hMdEnc->spar_md.band_coeffs_idx, nB, symbol_arr_re, decd_cell_dims, DECD_COEFF, planarCP );
+    ivas_copy_band_coeffs_idx_to_arr( hMdEnc->spar_md.band_coeffs_idx, nB, symbol_arr_re, decd_cell_dims, DECD_COEFF
+#ifndef FIX_280_PLANAR_CP
+                                      ,
+                                      planarCP
+#endif
+    );
 
     if ( any_diff == 1 )
     {
-        ivas_copy_band_coeffs_idx_to_arr( hMdEnc->spar_md_prior.band_coeffs_idx_mapped, nB, symbol_arr_old_re, decd_cell_dims, DECD_COEFF, planarCP );
+        ivas_copy_band_coeffs_idx_to_arr( hMdEnc->spar_md_prior.band_coeffs_idx_mapped, nB, symbol_arr_old_re, decd_cell_dims, DECD_COEFF
+#ifndef FIX_280_PLANAR_CP
+                                          ,
+                                          planarCP
+#endif
+        );
     }
-
+#ifndef FIX_280_PLANAR_CP
     if ( planarCP )
     {
         for ( i = 0; i < nB; i++ )
@@ -1724,6 +1801,7 @@ static int16_t ivas_get_arith_coded_bs(
             decd_cell_dims[i].dim1 = decd_cell_dims[i].dim1 - IVAS_SPAR_HOA3_NP_CHS;
         }
     }
+#endif
     arith_result = ivas_arith_encode_cmplx_cell_array( &hMdEnc->arith_coeffs.decd_arith_re[qsi], &hMdEnc->arith_coeffs.decd_arith_re_diff[qsi], pDo_diff, nB,
                                                        symbol_arr_re, symbol_arr_old_re, decd_cell_dims, hMetaData, any_diff, hMdEnc->spar_md_cfg.max_bits_per_blk );
     if ( arith_result < 0 )
@@ -1731,11 +1809,21 @@ static int16_t ivas_get_arith_coded_bs(
         return -1;
     }
 
-    ivas_copy_band_coeffs_idx_to_arr( hMdEnc->spar_md.band_coeffs_idx, nB, symbol_arr_re, decx_cell_dims, DECX_COEFF, planarCP );
+    ivas_copy_band_coeffs_idx_to_arr( hMdEnc->spar_md.band_coeffs_idx, nB, symbol_arr_re, decx_cell_dims, DECX_COEFF
+#ifndef FIX_280_PLANAR_CP
+                                      ,
+                                      planarCP
+#endif
+    );
 
     if ( any_diff == 1 )
     {
-        ivas_copy_band_coeffs_idx_to_arr( hMdEnc->spar_md_prior.band_coeffs_idx_mapped, nB, symbol_arr_old_re, decx_cell_dims, DECX_COEFF, planarCP );
+        ivas_copy_band_coeffs_idx_to_arr( hMdEnc->spar_md_prior.band_coeffs_idx_mapped, nB, symbol_arr_old_re, decx_cell_dims, DECX_COEFF
+#ifndef FIX_280_PLANAR_CP
+                                          ,
+                                          planarCP
+#endif
+        );
     }
 
     return 0;
-- 
GitLab


From e9bfe105548e7f4adceb5bd8c7e63922ee63001d Mon Sep 17 00:00:00 2001
From: Vidhya V P <100825@ittiam.com>
Date: Thu, 15 Jun 2023 12:10:23 +0530
Subject: [PATCH 2/3] Added line spacing that was removed

---
 lib_com/ivas_spar_com.c    | 3 +++
 lib_dec/ivas_spar_md_dec.c | 5 +++++
 lib_enc/ivas_spar_md_enc.c | 9 +++++++++
 3 files changed, 17 insertions(+)

diff --git a/lib_com/ivas_spar_com.c b/lib_com/ivas_spar_com.c
index 59f976f4c9..86c9e76136 100644
--- a/lib_com/ivas_spar_com.c
+++ b/lib_com/ivas_spar_com.c
@@ -1273,6 +1273,7 @@ void ivas_calc_c_p_coeffs(
         {
             ivas_calc_c_coeffs_per_band( pSparMd, i_ts, postpred_cov_re, num_ch, num_dmx, band_idx, dtx_vad );
         }
+
 #ifndef FIX_280_PLANAR_CP
         if ( planarCP )
         {
@@ -1288,10 +1289,12 @@ void ivas_calc_c_p_coeffs(
             }
         }
 #endif
+
         if ( compute_p_flag == 1 )
         {
             ivas_calc_p_coeffs_per_band( pSparMd, i_ts, postpred_cov_re, num_ch, dtx_vad, num_dmx, band_idx );
         }
+
 #ifndef FIX_280_PLANAR_CP
         if ( planarCP )
         {
diff --git a/lib_dec/ivas_spar_md_dec.c b/lib_dec/ivas_spar_md_dec.c
index 2c212352d6..69988b317b 100644
--- a/lib_dec/ivas_spar_md_dec.c
+++ b/lib_dec/ivas_spar_md_dec.c
@@ -63,6 +63,7 @@ static const int16_t ivas_spar_dec_plc_spatial_target[IVAS_SPAR_MAX_CH] = { 1, 0
  *------------------------------------------------------------------------------------------*/
 
 static void ivas_get_spar_matrices( ivas_spar_md_dec_state_t *hMdDec, const int16_t num_bands_out, const int16_t n_ts, const int16_t bw, const int16_t dtx_vad, const int16_t nB, const int16_t numch_out, const int16_t active_w_vlbr );
+
 #ifndef FIX_280_PLANAR_CP
 static void ivas_decode_arith_bs( ivas_spar_md_dec_state_t *hMdDec, Decoder_State *st, const uint16_t qsi, const int16_t nB, const int16_t bands_bw, int16_t *pDo_diff, const int16_t freq_diff, const int16_t planarCP, const int16_t strat, const int32_t ivas_total_brate );
 
@@ -1838,6 +1839,7 @@ static void ivas_spar_dec_parse_md_bs(
     }
 
     qs = hMdDec->spar_md_cfg.quant_strat[qsi];
+
 #ifndef FIX_280_PLANAR_CP
     planarCP = 0;
     if ( ( qsi == 2 ) && ( use_planar_coeff ) )
@@ -2187,6 +2189,7 @@ static void ivas_decode_arith_bs(
 #endif
         );
     }
+
 #ifndef FIX_280_PLANAR_CP
     if ( planarCP )
     {
@@ -2196,6 +2199,7 @@ static void ivas_decode_arith_bs(
         }
     }
 #endif
+
     ivas_arith_decode_cmplx_cell_array( &hMdDec->arith_coeffs.drct_arith_re[qsi], &hMdDec->arith_coeffs.drct_arith_re_diff[qsi],
                                         st0, drct_cell_dims, pDo_diff, nB, symbol_arr_re, symbol_arr_old_re );
 
@@ -2215,6 +2219,7 @@ static void ivas_decode_arith_bs(
 #endif
         );
     }
+
 #ifndef FIX_280_PLANAR_CP
     if ( planarCP )
     {
diff --git a/lib_enc/ivas_spar_md_enc.c b/lib_enc/ivas_spar_md_enc.c
index bd2f817b48..6ac24e4039 100644
--- a/lib_enc/ivas_spar_md_enc.c
+++ b/lib_enc/ivas_spar_md_enc.c
@@ -72,6 +72,7 @@ static void ivas_band_mixer( float *cov_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
 #ifndef FIX_383_CLEAN_UP
 static void ivas_get_band_differential_index( ivas_band_coeffs_ind_t *pBand_idx, const int16_t q_levels[2], const int16_t one_sided, const int16_t nB, const int16_t complex_cov, const int16_t dim, const ivas_coeffs_type_t coeff_type );
 #endif
+
 static int16_t ivas_get_huffman_coded_bs( ivas_spar_md_enc_state_t *hMdEnc, BSTR_ENC_HANDLE hMetaData, const int16_t nB, const int16_t qsi,
 #ifndef FIX_280_PLANAR_CP
                                           const int16_t planarCP,
@@ -89,11 +90,13 @@ static ivas_error ivas_spar_set_enc_config( ivas_spar_md_enc_state_t *hMdEnc, in
 static void ivas_select_next_strat( ivas_strats_t prior_strat, ivas_strats_t cs[MAX_QUANT_STRATS], const int16_t dmx_switch, const int16_t dtx_vad );
 
 static void ivas_store_prior_coeffs( ivas_spar_md_enc_state_t *hMdEnc, const int16_t num_bands, const int16_t strat, const int16_t dtx_vad, const int16_t qsi );
+
 #ifndef FIX_280_PLANAR_CP
 static void ivas_write_spar_md_bitstream( ivas_spar_md_enc_state_t *hMdEnc, const int16_t nB, const int16_t bands_bw, BSTR_ENC_HANDLE hMetaData, const int32_t ivas_total_brate, const int16_t strat, const int16_t qsi, const int16_t planarCP );
 #else
 static void ivas_write_spar_md_bitstream( ivas_spar_md_enc_state_t *hMdEnc, const int16_t nB, const int16_t bands_bw, BSTR_ENC_HANDLE hMetaData, const int32_t ivas_total_brate, const int16_t strat, const int16_t qsi );
 #endif
+
 static void ivas_spar_quant_pred_coeffs_dtx( ivas_spar_md_t *pSpar_md, const float *pValues, const int16_t ndm, int16_t *pIndex, const int16_t dim1, float *pQuant );
 
 static void ivas_quant_p_per_band_dtx( float *pP_mat, const int16_t num_dec, const int16_t num_dmx, int16_t *ppIdx_pd, float *pP_out, const int16_t num_ch );
@@ -786,6 +789,7 @@ ivas_error ivas_spar_md_enc_process(
                     fprintf(stderr, "\n\n"); */
 #endif
 
+
 #ifndef FIX_280_PLANAR_CP
                     if ( planarCP )
                     {
@@ -949,6 +953,7 @@ ivas_error ivas_spar_md_enc_process(
 #endif
                 }
 #endif
+
                 ivas_quant_c_per_band( &hMdEnc->spar_md.band_coeffs[b], &hMdEnc->spar_md.band_coeffs_idx[b],
                                        &hMdEnc->spar_md_cfg.quant_strat[qsi], ndec, ndm );
 #ifdef SPAR_HOA_DBG
@@ -1522,6 +1527,7 @@ static int16_t ivas_get_huffman_coded_bs(
                 pred_offset = DIRAC_TO_SPAR_HBR_PRED_CHS;
             }
         }
+
 #ifndef FIX_280_PLANAR_CP
         if ( planarCP )
         {
@@ -1761,6 +1767,7 @@ static int16_t ivas_get_arith_coded_bs(
 #endif
         );
     }
+
 #ifndef FIX_280_PLANAR_CP
     if ( planarCP )
     {
@@ -1770,6 +1777,7 @@ static int16_t ivas_get_arith_coded_bs(
         }
     }
 #endif
+
     arith_result = ivas_arith_encode_cmplx_cell_array( &hMdEnc->arith_coeffs.drct_arith_re[qsi], &hMdEnc->arith_coeffs.drct_arith_re_diff[qsi], pDo_diff, nB,
                                                        symbol_arr_re, symbol_arr_old_re, drct_cell_dims, hMetaData, any_diff, hMdEnc->spar_md_cfg.max_bits_per_blk );
     if ( arith_result < 0 )
@@ -1793,6 +1801,7 @@ static int16_t ivas_get_arith_coded_bs(
 #endif
         );
     }
+
 #ifndef FIX_280_PLANAR_CP
     if ( planarCP )
     {
-- 
GitLab


From 629ff241502096a6ee8e3c4127fdbac73f4a7f87 Mon Sep 17 00:00:00 2001
From: Shikha Shetgeri <100861@ittiam.com>
Date: Thu, 15 Jun 2023 12:58:13 +0530
Subject: [PATCH 3/3] code clean up

---
 lib_com/ivas_cov_smooth.c  | 87 ++++++++++++++++++++++++++++++++++++++
 lib_com/ivas_spar_com.c    |  2 +
 lib_com/options.h          |  2 +-
 lib_dec/ivas_spar_md_dec.c |  6 +++
 4 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/lib_com/ivas_cov_smooth.c b/lib_com/ivas_cov_smooth.c
index e2aa44627b..7211274eea 100644
--- a/lib_com/ivas_cov_smooth.c
+++ b/lib_com/ivas_cov_smooth.c
@@ -41,6 +41,7 @@
 #include "prot.h"
 
 #define BAND_SMOOTH_REST_START_IDX ( 2 )
+#ifndef CODE_CLEAN_UP_DIRAC
 /*-----------------------------------------------------------------------------------------*
  * Function ivas_set_up_cov_smoothing()
  *
@@ -138,7 +139,93 @@ static void ivas_set_up_cov_smoothing(
 
     return;
 }
+#else
 
+/*-----------------------------------------------------------------------------------------*
+ * Function ivas_calculate_update_factor()
+ *
+ * To calculate the update factor
+ *-----------------------------------------------------------------------------------------*/
+
+static float ivas_calculate_update_factor( float *p_bin_to_band, int16_t active_bins )
+{
+    float update_factor_temp = 0.0f;
+    int16_t k;
+    for ( k = 0; k < active_bins; k++ )
+    {
+        update_factor_temp += p_bin_to_band[k];
+    }
+    return update_factor_temp;
+}
+
+/*-----------------------------------------------------------------------------------------*
+ * Function ivas_calculate_smoothning_factor()
+ *
+ * To calculate the Smoothning factor
+ *-----------------------------------------------------------------------------------------*/
+
+static void ivas_calculate_smoothning_factor( float *Smoothing_factor, float update_factor, const int16_t min_pool_size, const float max_update_rate, const COV_SMOOTHING_TYPE smooth_mode, const int32_t ivas_total_brate, int16_t j )
+{
+    float smooth_fact;
+    *Smoothing_factor = update_factor / min_pool_size;
+    if ( smooth_mode != COV_SMOOTH_MC )
+    {
+        if ( ivas_total_brate < IVAS_24k4 )
+        {
+            smooth_fact = 0.5f;
+        }
+        else
+        {
+            smooth_fact = 0.75f;
+        }
+        *Smoothing_factor *= ( j + 1 ) * smooth_fact;
+    }
+    if ( *Smoothing_factor > max_update_rate )
+    {
+        *Smoothing_factor = max_update_rate;
+    }
+}
+
+/*-----------------------------------------------------------------------------------------*
+ * Function ivas_set_up_cov_smoothing()
+ *
+ * Setup for covariance smoothing
+ *-----------------------------------------------------------------------------------------*/
+
+static void ivas_set_up_cov_smoothing(
+    ivas_cov_smooth_state_t *hCovState,
+    ivas_filterbank_t *pFb,
+    const float max_update_rate,
+    const int16_t min_pool_size,
+    const COV_SMOOTHING_TYPE smooth_mode, /* i  : flag multichannel vs SPAR       */
+    const int32_t ivas_total_brate )
+{
+    int16_t j;
+    float update_factor;
+    if ( smooth_mode == COV_SMOOTH_MC )
+    {
+        for ( j = 0; j < pFb->filterbank_num_bands; j++ )
+        {
+            int16_t active_bins = pFb->fb_bin_to_band.pFb_active_bins_per_band[j];
+            update_factor = ivas_calculate_update_factor( pFb->fb_bin_to_band.pFb_bin_to_band[j], active_bins );
+            ivas_calculate_smoothning_factor( &hCovState->pSmoothing_factor[j], update_factor, min_pool_size, max_update_rate, smooth_mode, ivas_total_brate, j );
+        }
+    }
+    else
+    {
+        for ( j = 0; j < pFb->filterbank_num_bands; j++ )
+        {
+            float *p_bin_to_band = pFb->fb_bin_to_band.pp_short_stride_bin_to_band[j];
+            int16_t active_bins = pFb->fb_bin_to_band.p_short_stride_num_bins_per_band[j];
+            update_factor = ivas_calculate_update_factor( p_bin_to_band, active_bins );
+            ivas_calculate_smoothning_factor( &hCovState->pSmoothing_factor[j], update_factor, min_pool_size, max_update_rate, smooth_mode, ivas_total_brate, j );
+        }
+    }
+
+    hCovState->prior_bank_idx = -1;
+}
+
+#endif
 
 /*-------------------------------------------------------------------------
  * ivas_spar_covar_smooth_enc_open()
diff --git a/lib_com/ivas_spar_com.c b/lib_com/ivas_spar_com.c
index 86c9e76136..46b5351318 100644
--- a/lib_com/ivas_spar_com.c
+++ b/lib_com/ivas_spar_com.c
@@ -802,6 +802,7 @@ void ivas_create_fullr_dmx_mat(
     {
         ivas_reorder_array( down_mix_mat1_re, in_chans, order, mixer_mat, start_band, end_band );
     }
+#ifndef CODE_CLEAN_UP_DIRAC
     else
     {
         /* Custom 4x4 mult for WYiX case */
@@ -823,6 +824,7 @@ void ivas_create_fullr_dmx_mat(
             }
         }
     }
+#endif
 
     return;
 }
diff --git a/lib_com/options.h b/lib_com/options.h
index c5900869ab..7b65897041 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -154,7 +154,7 @@
 // #define FIX_532_ISM_MD_INACTIVE                         /* VA: issue 532: improve MD coding in ISM inactive frames */
 #define FIX_547_NAN_IGF_DEC                             /* FhG: issue 547: fix possible nan in IGF decoder */
 #define FIX_280_PLANAR_CP                               /* Dlb : fix issue 28 : remove planarCP=1 related code*/
-
+#define CODE_CLEAN_UP_DIRAC                             /*Dlb : code clean up*/
 
 /* ################## End DEVELOPMENT switches ######################### */
 /* clang-format on */
diff --git a/lib_dec/ivas_spar_md_dec.c b/lib_dec/ivas_spar_md_dec.c
index 69988b317b..6547d13a1d 100644
--- a/lib_dec/ivas_spar_md_dec.c
+++ b/lib_dec/ivas_spar_md_dec.c
@@ -625,9 +625,11 @@ static ivas_error ivas_spar_set_dec_config(
         case 9: /* IVAS_HOA_2_CH */
             hMdDec->num_decorr = IVAS_TD_DECORR_OUT_5CH;
             break;
+#ifndef CODE_CLEAN_UP_DIRAC
         case 16: /* IVAS_HOA_3_CH */ // ToDo: is this relevant?
             hMdDec->num_decorr = IVAS_TD_DECORR_OUT_12CH;
             break;
+#endif
         case 6: /* IVAS_HOA_2_CH */
             hMdDec->num_decorr = IVAS_TD_DECORR_OUT_2CH;
             break;
@@ -1357,6 +1359,7 @@ static void ivas_get_spar_matrices(
                 {
                     ivas_mat_col_rearrange( tmp_dm_re, order, i_ts, hMdDec->mixer_mat, b, numch_out );
                 }
+#ifndef CODE_CLEAN_UP_DIRAC
                 else
                 {
                     /* Custom 4x4 mult for WYiX case */
@@ -1375,6 +1378,7 @@ static void ivas_get_spar_matrices(
                         hMdDec->mixer_mat[i][3][b + i_ts * IVAS_MAX_NUM_BANDS] = tmp_dm_re[i][2];
                     }
                 }
+#endif
             }
             else
             {
@@ -1382,6 +1386,7 @@ static void ivas_get_spar_matrices(
                 {
                     ivas_mat_col_rearrange( tmp_C1_re, order, i_ts, hMdDec->mixer_mat, b, numch_out );
                 }
+#ifndef CODE_CLEAN_UP_DIRAC
                 else
                 {
                     /* Custom 4x4 mult for WYiX case */
@@ -1400,6 +1405,7 @@ static void ivas_get_spar_matrices(
                         hMdDec->mixer_mat[i][3][b + i_ts * IVAS_MAX_NUM_BANDS] = tmp_C1_re[i][2];
                     }
                 }
+#endif
             }
 
             if ( dmx_ch > 0 )
-- 
GitLab