diff --git a/lib_com/ivas_rom_com.c b/lib_com/ivas_rom_com.c index a131509ea1ec18c18630518f7a4835e4fd276685..5f15fda6e4dcce14d1be5b58461618518d68b3a8 100644 --- a/lib_com/ivas_rom_com.c +++ b/lib_com/ivas_rom_com.c @@ -1467,7 +1467,9 @@ 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 15fbd2048d8219f892126733b72b603a2e16418c..a74f378b3bcba9b5334bcd1e833bd497da758ccd 100644 --- a/lib_com/ivas_rom_com.h +++ b/lib_com/ivas_rom_com.h @@ -180,7 +180,9 @@ 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_com/rom_com.c b/lib_com/rom_com.c index 1e63eda4804791bcbb69de49d45b597417dcc734..f08f41a1df98eeb46a454f40d21a09ed61aad5e3 100755 --- a/lib_com/rom_com.c +++ b/lib_com/rom_com.c @@ -13714,43 +13714,6 @@ const float SHBCB_SubGain5bit[128] = -1.0319320f, -0.3646283f, -0.2706210f, -0.1999401f }; -/* 5-bit SWB TBE Gain shape codebook in linear domain */ -const float SHBCB_SubGain5bit_Linear[128] = -{ - 0.7148779f, 0.3338397f, 0.3968293f, 0.4288434f, - 0.3704218f, 0.4662302f, 0.4954065f, 0.6119182f, - 0.0953547f, 0.1157587f, 0.8737744f, 0.3276141f, - 0.0248484f, 0.4350941f, 0.5010864f, 0.5405046f, - 0.8070146f, 0.3943615f, 0.3038853f, 0.2585717f, - 0.3227228f, 0.5631068f, 0.2846687f, 0.6520339f, - 0.6003934f, 0.4863782f, 0.4977593f, 0.3544197f, - 0.9627575f, 0.0726042f, 0.0331859f, 0.0280922f, - 0.2727022f, 0.3460397f, 0.4562386f, 0.7493843f, - 0.7453516f, 0.5222745f, 0.2745141f, 0.1279921f, - 0.5206095f, 0.7343889f, 0.2366333f, 0.2559601f, - 0.7099450f, 0.2673885f, 0.1921454f, 0.5261242f, - 0.1327955f, 0.2004371f, 0.3135739f, 0.8913248f, - 0.1027291f, 0.1007387f, 0.0911556f, 0.9689233f, - 0.4677018f, 0.2990939f, 0.3447584f, 0.7242186f, - 0.0247854f, 0.0458665f, 0.3474266f, 0.7023649f, - 0.6324765f, 0.5506413f, 0.3273258f, 0.3947177f, - 0.7742773f, 0.4603549f, 0.1169132f, 0.0621896f, - 0.5940259f, 0.5914681f, 0.4394770f, 0.2279776f, - 0.2424894f, 0.5659803f, 0.5648066f, 0.4951982f, - 0.5773947f, 0.2484205f, 0.6670044f, 0.2593132f, - 0.9295383f, 0.2084896f, 0.1697136f, 0.1662293f, - 0.5284109f, 0.4850199f, 0.4179306f, 0.5341725f, - 0.5046524f, 0.3401957f, 0.5514884f, 0.5382623f, - 0.2758891f, 0.1518727f, 0.6583195f, 0.5768060f, - 0.1783466f, 0.3452303f, 0.5827488f, 0.6721577f, - 0.3645189f, 0.5012657f, 0.6931207f, 0.2671610f, - 0.4139961f, 0.6682788f, 0.4326411f, 0.4004867f, - 0.1617602f, 0.8647654f, 0.3020888f, 0.2133654f, - 0.3137825f, 0.3432938f, 0.7035535f, 0.4934421f, - 0.4418455f, 0.4953783f, 0.5813250f, 0.4439323f, - 0.0929112f, 0.4318886f, 0.5362644f, 0.6310444f -}; - /* 5-bit TD WB BWE temporal shaping codebook */ const float HBCB_SubGain5bit[128] = { diff --git a/lib_com/rom_com.h b/lib_com/rom_com.h index e6284ab417d0b2ef4a0704e8ef60dbdc45e968c2..ad234e26d437c082c9cc11e0625220f0aa2a5275 100644 --- a/lib_com/rom_com.h +++ b/lib_com/rom_com.h @@ -530,7 +530,6 @@ extern const float wb_bwe_lsfvq_cbook_8bit[]; extern const float lbr_wb_bwe_lsfvq_cbook_2bit[]; extern const float swb_tbe_lsfvq_cbook_8b[]; extern const float SHBCB_SubGain5bit[]; /* 5 bit Quantizer table for SHB gain shapes */ -extern const float SHBCB_SubGain5bit_Linear[]; extern const float HBCB_SubGain5bit[]; /* 5-bit TD WB BWE temporal shaping codebook */ extern const float SHBCB_FrameGain64[]; /* 6 bit Quantizer table for SHB overall gain */ extern const float SHBCB_FrameGain16[]; diff --git a/lib_rend/ivas_rom_rend.c b/lib_rend/ivas_rom_rend.c index 8c39d42c41bfaa0a71f181552ea55c6eccdfbb96..db0e5b47bf33da49817d554a20612aeff93e8136 100644 --- a/lib_rend/ivas_rom_rend.c +++ b/lib_rend/ivas_rom_rend.c @@ -456,8 +456,6 @@ const float norm_sn3d_hoa3[16] = }; /* Order 11 t-design */ -const uint16_t t_design_11_size = 70; - const float t_design_11_azimuth[70] = { 1.329273e+02f, -8.393495e+01f, 8.474100e+00f, -1.133408e+02f, -1.032659e+02f, -3.323704e+01f, 2.185643e+01f, -1.565395e+02f, diff --git a/lib_rend/ivas_rom_rend.h b/lib_rend/ivas_rom_rend.h index e9fdd2487f46a70625e646f66b90bae4ec22d284..00bf4e3a29d93c4db480c752af4258b429f5e7a3 100644 --- a/lib_rend/ivas_rom_rend.h +++ b/lib_rend/ivas_rom_rend.h @@ -94,7 +94,6 @@ extern const float defaultHRIR_right_avg_power_16kHz[LR_IAC_LENGTH_NR_FC]; extern const float norm_sn3d_hoa3[16]; /* Order 11 t-design */ -extern const uint16_t t_design_11_size; extern const float t_design_11_azimuth[70]; extern const float t_design_11_elevation[70];