Loading lib_com/ivas_prot_fx.h +14 −1 Original line number Diff line number Diff line Loading @@ -1567,7 +1567,12 @@ void ivas_mdct_core_tns_ns_fx( Word32 *x_fx[CPE_CHANNELS][NB_DIV], /* o : synthesis @internal_FS */ Word32 Aq_fx[CPE_CHANNELS][( NB_SUBFR16k + 1 ) * ( M + 1 )], /* o : LP coefficients */ const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0) */ Word16 x_e[CPE_CHANNELS][NB_DIV] ); #ifdef OPT_SBA_DEC_V2_NBE Word16 x_e #else /* OPT_SBA_DEC_V2_NBE */ Word16 x_e[CPE_CHANNELS][NB_DIV] #endif /* OPT_SBA_DEC_V2_NBE */ ); void decoder_tcx_imdct_fx( Decoder_State *st, /* i/o: coder memory state */ Loading Loading @@ -1928,9 +1933,17 @@ void ivas_mdct_core_invQ_fx( Word16 fUseTns[CPE_CHANNELS][NB_DIV], /* i : flag TNS enabled */ STnsData tnsData[CPE_CHANNELS][NB_DIV], /* i : TNS parameter */ Word32 *x_0[CPE_CHANNELS][NB_DIV], /* i/o: signal buffer */ #ifdef OPT_SBA_DEC_V2_NBE Word16 x_0_e, #else /* OPT_SBA_DEC_V2_NBE */ Word16 x_0_e[CPE_CHANNELS][NB_DIV], #endif /* OPT_SBA_DEC_V2_NBE */ Word32 *x[CPE_CHANNELS][NB_DIV], /* i/o: signal buffer */ #ifdef OPT_SBA_DEC_V2_NBE Word16 x_e, #else /* OPT_SBA_DEC_V2_NBE */ Word16 x_e[CPE_CHANNELS][NB_DIV], #endif /* OPT_SBA_DEC_V2_NBE */ Word16 x_len[CPE_CHANNELS][NB_DIV], Word16 Aq[CPE_CHANNELS][( NB_SUBFR16k + 1 ) * ( M + 1 )], /* i : LP coefficients */ Word16 ms_mask[NB_DIV][MAX_SFB], /* i : M/S mask */ Loading lib_com/options.h +2 −0 Original line number Diff line number Diff line Loading @@ -77,6 +77,8 @@ #define FIX_1379_MASA_ANGLE_ROUND /* Note: each compile switch (FIX_1101_...) is independent from the other ones */ #define OPT_REND_V1_NBE #define OPT_SBA_DEC_V2_NBE #define OPT_SBA_REND_V1_BE #define OPT_HEAD_ROT_REND_V1_BE #define OPT_SBA_DEC_V2_BE Loading lib_com/prot_fx.h +6 −2 Original line number Diff line number Diff line Loading @@ -6435,7 +6435,11 @@ void TonalMDCTConceal_Apply( void TonalMDCTConceal_Apply_ivas_fx( TonalMDCTConcealPtr hTonalMDCTConc, /*IN */ Word32 *mdctSpectrum, /*IN/OUT*/ #ifdef OPT_SBA_DEC_V2_NBE Word16 mdctSpectrum_exp, /*IN */ #else /* OPT_SBA_DEC_V2_NBE */ Word16 mdctSpectrum_exp[L_FRAME48k], /*IN */ #endif /* OPT_SBA_DEC_V2_NBE */ const PsychoacousticParameters *psychParamsCurrent ); void TonalMDCTConceal_InsertNoise_ivas_fx( Loading lib_com/rom_com.c +7 −22 Original line number Diff line number Diff line Loading @@ -1273,28 +1273,6 @@ const Word16 sin_table256_fx[] = * 1/4 resolution interpolation filter (-3 dB at 0.913*fs/2) *----------------------------------------------------------------------------------*/ const Word16 inter4_2_fx_Q15[65] = {//Q15 30801, 28062, 20718, 11061, 1935, -4294, -6533, -5195, -1846, 1559, 3497, 3398, 1705, -497, -2087, -2413, -1523, -32, 1252, 1741, 1312, 305, -710, -1237, -1087, -426, 350, 848, 862, 452, -119, -550, -650, -418, -17, 330, 462, 349, 85, -175, -306, -265, -104, 76, 184, 182, 93, -20, -98, -110, -66, -3, 43, 55, 37, 8, -13, -20, -14, -4, 2, 3, 1, 0, 0, }; const Word16 inter4_2_fx[] = {//evs table , some mismatch in values compared to float is observed 0, 1, 2, 1, Loading Loading @@ -1366,6 +1344,13 @@ const Word16 pitch_inter4_2[PIT_FIR_SIZE2] = 3/*0.000098f Q15*/, 2/*0.000048f Q15*/, 0/*0.000007f Q15*/, 0/*0.000000f Q15*/ }; /* 1/4 resolution interpolation filter (-3 dB at 0.791*fs/2) */ const Word32 L_pitch_inter4_1[UP_SAMP * L_INTERPOL1 + 1] = /* Q31 */ { 1932735283, 1758701061, 1298905484, 711630983, 180298432, -162768528, -280712608, -226956816, -100446400, 9592809, 59676424, 55065776, 26996016, 4138201, -3373696, -1617055, 0 }; /* 1/4 resolution interpolation filter (-3 dB at 0.791*fs/2) */ const Word16 pitch_inter4_1[UP_SAMP * L_INTERPOL1 + 1] = { 29491/*0.900000F Q15*/, lib_com/rom_com.h +9 −9 Original line number Diff line number Diff line Loading @@ -172,10 +172,10 @@ extern const Word32 crit_bands_fx[]; extern const float sincos_t_ext[]; // fft_rel dep extern const Word16 sincos_t_rad3_fx[]; // Q15 extern const Word16 fft256_read_indexes[]; /* FFT Q0*/ extern const Word16 inter4_2_fx_Q15[]; // Q15 /* 1/4 resolution interpolation filter */ extern const Word16 inter4_2_fx[]; extern const Word16 pitch_inter4_1[UP_SAMP * L_INTERPOL1 + 1]; /*1Q14*/ extern const Word16 pitch_inter4_2[PIT_FIR_SIZE2]; /*Q15*/ extern const Word32 L_pitch_inter4_1[UP_SAMP * L_INTERPOL1 + 1]; /*Q31*/ extern const Word32 L_pitch_inter4_2[PIT_FIR_SIZE2]; /*Q31*/ extern const Word16 Assym_window_W16fx[]; // Q15 extern const Word16 assym_window_16k_fx[]; // Q15 Loading Loading
lib_com/ivas_prot_fx.h +14 −1 Original line number Diff line number Diff line Loading @@ -1567,7 +1567,12 @@ void ivas_mdct_core_tns_ns_fx( Word32 *x_fx[CPE_CHANNELS][NB_DIV], /* o : synthesis @internal_FS */ Word32 Aq_fx[CPE_CHANNELS][( NB_SUBFR16k + 1 ) * ( M + 1 )], /* o : LP coefficients */ const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0) */ Word16 x_e[CPE_CHANNELS][NB_DIV] ); #ifdef OPT_SBA_DEC_V2_NBE Word16 x_e #else /* OPT_SBA_DEC_V2_NBE */ Word16 x_e[CPE_CHANNELS][NB_DIV] #endif /* OPT_SBA_DEC_V2_NBE */ ); void decoder_tcx_imdct_fx( Decoder_State *st, /* i/o: coder memory state */ Loading Loading @@ -1928,9 +1933,17 @@ void ivas_mdct_core_invQ_fx( Word16 fUseTns[CPE_CHANNELS][NB_DIV], /* i : flag TNS enabled */ STnsData tnsData[CPE_CHANNELS][NB_DIV], /* i : TNS parameter */ Word32 *x_0[CPE_CHANNELS][NB_DIV], /* i/o: signal buffer */ #ifdef OPT_SBA_DEC_V2_NBE Word16 x_0_e, #else /* OPT_SBA_DEC_V2_NBE */ Word16 x_0_e[CPE_CHANNELS][NB_DIV], #endif /* OPT_SBA_DEC_V2_NBE */ Word32 *x[CPE_CHANNELS][NB_DIV], /* i/o: signal buffer */ #ifdef OPT_SBA_DEC_V2_NBE Word16 x_e, #else /* OPT_SBA_DEC_V2_NBE */ Word16 x_e[CPE_CHANNELS][NB_DIV], #endif /* OPT_SBA_DEC_V2_NBE */ Word16 x_len[CPE_CHANNELS][NB_DIV], Word16 Aq[CPE_CHANNELS][( NB_SUBFR16k + 1 ) * ( M + 1 )], /* i : LP coefficients */ Word16 ms_mask[NB_DIV][MAX_SFB], /* i : M/S mask */ Loading
lib_com/options.h +2 −0 Original line number Diff line number Diff line Loading @@ -77,6 +77,8 @@ #define FIX_1379_MASA_ANGLE_ROUND /* Note: each compile switch (FIX_1101_...) is independent from the other ones */ #define OPT_REND_V1_NBE #define OPT_SBA_DEC_V2_NBE #define OPT_SBA_REND_V1_BE #define OPT_HEAD_ROT_REND_V1_BE #define OPT_SBA_DEC_V2_BE Loading
lib_com/prot_fx.h +6 −2 Original line number Diff line number Diff line Loading @@ -6435,7 +6435,11 @@ void TonalMDCTConceal_Apply( void TonalMDCTConceal_Apply_ivas_fx( TonalMDCTConcealPtr hTonalMDCTConc, /*IN */ Word32 *mdctSpectrum, /*IN/OUT*/ #ifdef OPT_SBA_DEC_V2_NBE Word16 mdctSpectrum_exp, /*IN */ #else /* OPT_SBA_DEC_V2_NBE */ Word16 mdctSpectrum_exp[L_FRAME48k], /*IN */ #endif /* OPT_SBA_DEC_V2_NBE */ const PsychoacousticParameters *psychParamsCurrent ); void TonalMDCTConceal_InsertNoise_ivas_fx( Loading
lib_com/rom_com.c +7 −22 Original line number Diff line number Diff line Loading @@ -1273,28 +1273,6 @@ const Word16 sin_table256_fx[] = * 1/4 resolution interpolation filter (-3 dB at 0.913*fs/2) *----------------------------------------------------------------------------------*/ const Word16 inter4_2_fx_Q15[65] = {//Q15 30801, 28062, 20718, 11061, 1935, -4294, -6533, -5195, -1846, 1559, 3497, 3398, 1705, -497, -2087, -2413, -1523, -32, 1252, 1741, 1312, 305, -710, -1237, -1087, -426, 350, 848, 862, 452, -119, -550, -650, -418, -17, 330, 462, 349, 85, -175, -306, -265, -104, 76, 184, 182, 93, -20, -98, -110, -66, -3, 43, 55, 37, 8, -13, -20, -14, -4, 2, 3, 1, 0, 0, }; const Word16 inter4_2_fx[] = {//evs table , some mismatch in values compared to float is observed 0, 1, 2, 1, Loading Loading @@ -1366,6 +1344,13 @@ const Word16 pitch_inter4_2[PIT_FIR_SIZE2] = 3/*0.000098f Q15*/, 2/*0.000048f Q15*/, 0/*0.000007f Q15*/, 0/*0.000000f Q15*/ }; /* 1/4 resolution interpolation filter (-3 dB at 0.791*fs/2) */ const Word32 L_pitch_inter4_1[UP_SAMP * L_INTERPOL1 + 1] = /* Q31 */ { 1932735283, 1758701061, 1298905484, 711630983, 180298432, -162768528, -280712608, -226956816, -100446400, 9592809, 59676424, 55065776, 26996016, 4138201, -3373696, -1617055, 0 }; /* 1/4 resolution interpolation filter (-3 dB at 0.791*fs/2) */ const Word16 pitch_inter4_1[UP_SAMP * L_INTERPOL1 + 1] = { 29491/*0.900000F Q15*/,
lib_com/rom_com.h +9 −9 Original line number Diff line number Diff line Loading @@ -172,10 +172,10 @@ extern const Word32 crit_bands_fx[]; extern const float sincos_t_ext[]; // fft_rel dep extern const Word16 sincos_t_rad3_fx[]; // Q15 extern const Word16 fft256_read_indexes[]; /* FFT Q0*/ extern const Word16 inter4_2_fx_Q15[]; // Q15 /* 1/4 resolution interpolation filter */ extern const Word16 inter4_2_fx[]; extern const Word16 pitch_inter4_1[UP_SAMP * L_INTERPOL1 + 1]; /*1Q14*/ extern const Word16 pitch_inter4_2[PIT_FIR_SIZE2]; /*Q15*/ extern const Word32 L_pitch_inter4_1[UP_SAMP * L_INTERPOL1 + 1]; /*Q31*/ extern const Word32 L_pitch_inter4_2[PIT_FIR_SIZE2]; /*Q31*/ extern const Word16 Assym_window_W16fx[]; // Q15 extern const Word16 assym_window_16k_fx[]; // Q15 Loading