diff --git a/lib_com/ivas_rom_com.c b/lib_com/ivas_rom_com.c index de266ed6c5621c11471d4233b6fbdb395c2139f3..ca0981dd34f501080901a2c6c83c732597a2c6e7 100644 --- a/lib_com/ivas_rom_com.c +++ b/lib_com/ivas_rom_com.c @@ -1464,9 +1464,7 @@ const int16_t pr_pd_idx_pairs[3][3][2] = { { { 1, 1 },{ 2, 2 },{ 3, 3 } },{ { 1, const int16_t remix_order_set[1][DIRAC_MAX_ANA_CHANS] = { /* WYZX --> WYXZ... */ { 0, 1, 3, 2, 4, 5, 6, 7, 8, 9, 10 } }; -#ifdef SPAR_HOA_DBG -const int16_t keep_planar[IVAS_SPAR_MAX_CH - IVAS_SPAR_MAX_DMX_CHS] = { 1, 1, 1, 1, 1, 1 }; -#endif + const int16_t HOA_keep_ind[IVAS_SPAR_MAX_FB_IN_CHAN] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 15}; const int16_t HOA_keep_ind_spar[IVAS_SPAR_MAX_CH] = {0, 1, 2, 3, 4, 8, 9, 10, 10, 10, 10}; const int16_t HOA_keep_ind_spar512[IVAS_SPAR_MAX_CH] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; diff --git a/lib_com/ivas_rom_com.h b/lib_com/ivas_rom_com.h index c559a4f382d73f30076b42a3c6ca56242598c5da..d851e2c971b6e5625c06c669ac6aa3b4c776b4bb 100644 --- a/lib_com/ivas_rom_com.h +++ b/lib_com/ivas_rom_com.h @@ -180,9 +180,6 @@ extern const ivas_huff_models_t ivas_huff_drct_r_consts[TOTAL_DRCT_QUANT_STRATS] extern const ivas_huff_models_t ivas_huff_decd_r_consts[TOTAL_DECD_QUANT_STRATS]; extern const ivas_spar_br_table_t ivas_spar_br_table_consts[IVAS_SPAR_BR_TABLE_LEN]; extern const int16_t remix_order_set[1][DIRAC_MAX_ANA_CHANS]; -#ifdef SPAR_HOA_DBG -extern const int16_t keep_planar[IVAS_SPAR_MAX_CH - FOA_CHANNELS]; -#endif extern const int16_t HOA_keep_ind[IVAS_SPAR_MAX_FB_IN_CHAN]; extern const int16_t HOA_keep_ind_spar[IVAS_SPAR_MAX_CH]; extern const int16_t HOA_keep_ind_spar512[IVAS_SPAR_MAX_CH]; diff --git a/lib_enc/ivas_spar_md_enc.c b/lib_enc/ivas_spar_md_enc.c index 94ae5e0b1b391a509d54c5f351a8472f94d1381b..4e97037f1e41a60ea012c908878c5e5e0b31e9d2 100644 --- a/lib_enc/ivas_spar_md_enc.c +++ b/lib_enc/ivas_spar_md_enc.c @@ -962,14 +962,6 @@ ivas_error ivas_spar_md_enc_process( fprintf( stdout, "i: %d -- %.2f\t|\t", i, hMdEnc->spar_md.band_coeffs[b].pred_quant_re[i] ); if ( i < num_ch - ndm ) { - if ( keep_planar[i] == 1 ) - { - fprintf( stdout, ">>" ); - } - else - { - fprintf( stdout, " " ); - } for ( j = 0; j < ndm - 1; j++ ) { fprintf( stdout, "%.2f\t", hMdEnc->spar_md.band_coeffs[b].C_quant_re[i][j] );