Loading lib_com/ivas_rom_com_fx.c +2 −1 Original line number Diff line number Diff line Loading @@ -82,6 +82,7 @@ const Word16 dft_band_res_cod[3][4] = {0,5,6,7} }; #ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01 // Q31 const Word32 dft_res_gains_q_Q31[][2] = { Loading Loading @@ -247,7 +248,7 @@ const Word32 dft_res_gains_q_Q31[][2] = {2144077696, 13136157 }, {2147440640, 13580687 } }; #endif /* tables for adaptive Golomb-Rice coding of DFT stereo parameters */ const Word16 dft_code_itd[] = Loading lib_com/options.h +1 −0 Original line number Diff line number Diff line Loading @@ -102,6 +102,7 @@ #define HARMONIZE_2537_SetTCXModeInfo /* FhG: Harmonize SetTCXModeInfo - IVAS_VERSION OBVIOUSLY NOT FITTING FOR EVS - pipes not green */ #define HARMONIZE_2537_GetTCXMaxenergyChange /* FhG: Harmonize GetTCXMaxenergyChange */ #define HARMONIZE_2508_InitTransientDetection /* FhG: harmonize GetAttackForTCXDecision derivates for evs/ivas */ #define FIX_BASOP_2095_REMOVE_TABLES_PT01 /* FhG: BASOP issue 2095: remove unused tables, part 01 */ /* #################### End BE switches ################################## */ Loading lib_com/rom_com.h +4 −0 Original line number Diff line number Diff line Loading @@ -1152,7 +1152,9 @@ extern const Word32 rot_vec_syn_re_L60_fx[30]; // Q31 extern const Word32 rot_vec_syn_im_L60_fx[30]; // Q31 extern const Word16 bpf_weights_16_Fx[16]; // Q15 #ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01 extern const Word16 bpf_weights_16_ivas_fx[16]; // Q15 #endif extern const Word32 bpf_weights_16_ivas_fx_32[16]; // Q30 extern const Word16 CNG_details_codebook_fx[64][NUM_ENV_CNG]; // Q6 Loading Loading @@ -1625,6 +1627,8 @@ extern const Word32 rot_vec_ana_re_L60_fx[30]; // Q29 extern const Word32 rot_vec_ana_im_L60_fx[30]; // Q29 extern const Word16 LP_assym_window_fx[]; /* Assymetric window for LP analysis @12.8kHz (Q15) */ #ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01 extern const Word16 LP_assym_window_16k_fx[]; /* Assymetric window for LP analysis @16kHz (Q15) */ #endif #endif lib_com/rom_com_fx.c +4 −1 Original line number Diff line number Diff line Loading @@ -6814,7 +6814,6 @@ const Word32 rot_vec_syn_im_L60_fx[30] = -232316640 ,-235170976 ,-237380736 ,-238939840 ,-239844032 , }; const Word16 bpf_weights_16_Fx[16] = { 16385/*0.500020f Q15*/, 23022/*0.702561f Q15*/, 6843/*0.208838f Q15*/, 51/*0.001553f Q15*/, Loading @@ -6823,6 +6822,7 @@ const Word16 bpf_weights_16_Fx[16] = 3/*0.000081f Q15*/, 2/*0.000052f Q15*/, 1/*0.000017f Q15*/, 1/*0.000016f Q15*/ }; #ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01 const Word16 bpf_weights_16_ivas_fx[16] = { 32767/*0.999969f Q15*/, 23022/*0.702561f Q15*/, 6843/*0.208838f Q15*/, 51/*0.001553f Q15*/, Loading @@ -6830,6 +6830,7 @@ const Word16 bpf_weights_16_ivas_fx[16] = 9/*0.000270f Q15*/, 3/*0.000080f Q15*/, 1/*0.000030f Q15*/, 3/*0.000082f Q15*/, 3/*0.000081f Q15*/, 2/*0.000052f Q15*/, 1/*0.000017f Q15*/, 1/*0.000016f Q15*/ }; #endif const Word32 bpf_weights_16_ivas_fx_32[16] = { 1073784774/*1.000040f Q30*/, 754369130/*0.702561f Q30*/, 224238095/*0.208838f Q30*/, 1667521/*0.001553f Q30*/, Loading Loading @@ -36854,6 +36855,7 @@ const Word16 LP_assym_window_fx[L_LP] = { 0x0b0f, 0x0ad8, 0x0aa8, 0x0a82, 0x0a64, 0x0a4e, 0x0a41, 0x0a3d }; #ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01 /* LP analysis window (length of the window is 25ms which is 400 samples at 16kHz (Q15) */ const Word16 LP_assym_window_16k_fx[L_LP_16k] = { 0x0a3d, Loading Loading @@ -37257,6 +37259,7 @@ const Word16 LP_assym_window_16k_fx[L_LP_16k] = { 0x0a40, 0x0a3d, }; #endif /* 4-bit/3-bit TD SWB BWE differential LSF scalar quantizer tables */ /*Q15*/ Loading
lib_com/ivas_rom_com_fx.c +2 −1 Original line number Diff line number Diff line Loading @@ -82,6 +82,7 @@ const Word16 dft_band_res_cod[3][4] = {0,5,6,7} }; #ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01 // Q31 const Word32 dft_res_gains_q_Q31[][2] = { Loading Loading @@ -247,7 +248,7 @@ const Word32 dft_res_gains_q_Q31[][2] = {2144077696, 13136157 }, {2147440640, 13580687 } }; #endif /* tables for adaptive Golomb-Rice coding of DFT stereo parameters */ const Word16 dft_code_itd[] = Loading
lib_com/options.h +1 −0 Original line number Diff line number Diff line Loading @@ -102,6 +102,7 @@ #define HARMONIZE_2537_SetTCXModeInfo /* FhG: Harmonize SetTCXModeInfo - IVAS_VERSION OBVIOUSLY NOT FITTING FOR EVS - pipes not green */ #define HARMONIZE_2537_GetTCXMaxenergyChange /* FhG: Harmonize GetTCXMaxenergyChange */ #define HARMONIZE_2508_InitTransientDetection /* FhG: harmonize GetAttackForTCXDecision derivates for evs/ivas */ #define FIX_BASOP_2095_REMOVE_TABLES_PT01 /* FhG: BASOP issue 2095: remove unused tables, part 01 */ /* #################### End BE switches ################################## */ Loading
lib_com/rom_com.h +4 −0 Original line number Diff line number Diff line Loading @@ -1152,7 +1152,9 @@ extern const Word32 rot_vec_syn_re_L60_fx[30]; // Q31 extern const Word32 rot_vec_syn_im_L60_fx[30]; // Q31 extern const Word16 bpf_weights_16_Fx[16]; // Q15 #ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01 extern const Word16 bpf_weights_16_ivas_fx[16]; // Q15 #endif extern const Word32 bpf_weights_16_ivas_fx_32[16]; // Q30 extern const Word16 CNG_details_codebook_fx[64][NUM_ENV_CNG]; // Q6 Loading Loading @@ -1625,6 +1627,8 @@ extern const Word32 rot_vec_ana_re_L60_fx[30]; // Q29 extern const Word32 rot_vec_ana_im_L60_fx[30]; // Q29 extern const Word16 LP_assym_window_fx[]; /* Assymetric window for LP analysis @12.8kHz (Q15) */ #ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01 extern const Word16 LP_assym_window_16k_fx[]; /* Assymetric window for LP analysis @16kHz (Q15) */ #endif #endif
lib_com/rom_com_fx.c +4 −1 Original line number Diff line number Diff line Loading @@ -6814,7 +6814,6 @@ const Word32 rot_vec_syn_im_L60_fx[30] = -232316640 ,-235170976 ,-237380736 ,-238939840 ,-239844032 , }; const Word16 bpf_weights_16_Fx[16] = { 16385/*0.500020f Q15*/, 23022/*0.702561f Q15*/, 6843/*0.208838f Q15*/, 51/*0.001553f Q15*/, Loading @@ -6823,6 +6822,7 @@ const Word16 bpf_weights_16_Fx[16] = 3/*0.000081f Q15*/, 2/*0.000052f Q15*/, 1/*0.000017f Q15*/, 1/*0.000016f Q15*/ }; #ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01 const Word16 bpf_weights_16_ivas_fx[16] = { 32767/*0.999969f Q15*/, 23022/*0.702561f Q15*/, 6843/*0.208838f Q15*/, 51/*0.001553f Q15*/, Loading @@ -6830,6 +6830,7 @@ const Word16 bpf_weights_16_ivas_fx[16] = 9/*0.000270f Q15*/, 3/*0.000080f Q15*/, 1/*0.000030f Q15*/, 3/*0.000082f Q15*/, 3/*0.000081f Q15*/, 2/*0.000052f Q15*/, 1/*0.000017f Q15*/, 1/*0.000016f Q15*/ }; #endif const Word32 bpf_weights_16_ivas_fx_32[16] = { 1073784774/*1.000040f Q30*/, 754369130/*0.702561f Q30*/, 224238095/*0.208838f Q30*/, 1667521/*0.001553f Q30*/, Loading Loading @@ -36854,6 +36855,7 @@ const Word16 LP_assym_window_fx[L_LP] = { 0x0b0f, 0x0ad8, 0x0aa8, 0x0a82, 0x0a64, 0x0a4e, 0x0a41, 0x0a3d }; #ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01 /* LP analysis window (length of the window is 25ms which is 400 samples at 16kHz (Q15) */ const Word16 LP_assym_window_16k_fx[L_LP_16k] = { 0x0a3d, Loading Loading @@ -37257,6 +37259,7 @@ const Word16 LP_assym_window_16k_fx[L_LP_16k] = { 0x0a40, 0x0a3d, }; #endif /* 4-bit/3-bit TD SWB BWE differential LSF scalar quantizer tables */ /*Q15*/