Loading lib_dec/dec_tcx_fx.c +57 −57 Original line number Diff line number Diff line Loading @@ -2573,8 +2573,7 @@ void IMDCT_fx( Word32 *x, Word16 x_e, Word16 *old_syn_overl, Word16 *syn_Overl_T } #ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT_QWIN static Word16 IMDCT_ivas_fx_adjust_qwin( static Word16 IMDCT_ivas_fx_adjust_qwin( Word16 Q_syn_Overl_TDAC, Word16 Q_syn_Overl, Word16 Q_old_syn_Overl, Loading @@ -2589,8 +2588,7 @@ Word16 IMDCT_ivas_fx_adjust_qwin( return q_win; } static void IMDCT_ivas_fx_rescale( static void IMDCT_ivas_fx_rescale( Word16 *syn_Overl_TDAC, Word16 *Q_syn_Overl_TDAC, Word16 *syn_Overl, Loading @@ -2611,7 +2609,8 @@ void IMDCT_ivas_fx_rescale( oldLength = L_FRAME32k; move16(); if ( FB_flag ) { if ( FB_flag ) { oldLength = L_FRAME48k; move16(); } Loading Loading @@ -2675,8 +2674,7 @@ static Word16 TCX_MDCT_Inverse_GetScaleFactor( return factor; } static void TCX_MDCT_Inverse_qwin_fx( static void TCX_MDCT_Inverse_qwin_fx( Word32 *x, // Q( 31 - x_e ) Word16 x_e, Word16 *y, /* Qy */ Loading @@ -2684,8 +2682,7 @@ void TCX_MDCT_Inverse_qwin_fx( const Word16 m, /* Q0 */ const Word16 r, /* Q0 */ const Word16 element_mode, /* Q0 */ Word16 *q_win ) Word16 *q_win ) { Word16 i, fac, negfac, s; Loading @@ -2706,7 +2703,8 @@ void TCX_MDCT_Inverse_qwin_fx( negfac = negate( fac ); #if 1 IF ( *q_win == -2 ) { IF( *q_win == -2 ) { // x_e + q_win == L_norm_arr(tmp_buf, , *q_win ); // q_win = L_norm_arr(tmp_buf, , *q_win ) - x_e; s = L_norm_arr( tmp_buf + L2, m + R2 + L2 ); Loading Loading @@ -2743,16 +2741,14 @@ void TCX_MDCT_Inverse_qwin_fx( } } static void TCX_MDST_Inverse_qwin_fx( static void TCX_MDST_Inverse_qwin_fx( Word32 *x, /* exp(x_e) */ Word16 x_e, Word16 *y, /* Qx */ const Word16 l, /* Q0 */ const Word16 m, /* Q0 */ const Word16 r, /* Q0 */ Word16 *q_win ) Word16 *q_win ) { Word16 i, fac, negfac, s; Loading @@ -2775,7 +2771,8 @@ void TCX_MDST_Inverse_qwin_fx( negfac = negate( fac ); #if 1 IF ( *q_win == -2 ) { IF( *q_win == -2 ) { // x_e + q_win == L_norm_arr(tmp_buf, , *q_win ); // q_win = L_norm_arr(tmp_buf, , *q_win ) - x_e; s = L_norm_arr( tmp_buf + L2, m + R2 + L2 ); Loading Loading @@ -2817,8 +2814,7 @@ void TCX_MDST_Inverse_qwin_fx( * * *-------------------------------------------------------------------*/ static void TCX_MDXT_Inverse_qwin_fx( static void TCX_MDXT_Inverse_qwin_fx( const Word32 *x, /* exp(x_e) */ Word16 x_e, Word16 *y, /* Qx */ Loading @@ -2826,8 +2822,7 @@ void TCX_MDXT_Inverse_qwin_fx( const Word16 m, /* Q0 */ const Word16 r, /* Q0 */ const UWord16 kernel_type, /* Q0 */ Word16 *q_win ) Word16 *q_win ) { Word16 signLeft; Word16 signRight; Loading Loading @@ -2863,7 +2858,8 @@ void TCX_MDXT_Inverse_qwin_fx( } #if 1 IF ( *q_win == -2 ) { IF( *q_win == -2 ) { // x_e + q_win == L_norm_arr(tmp_buf, , *q_win ); // q_win = L_norm_arr(tmp_buf, , *q_win ) - x_e; s = L_norm_arr( tmp_buf + L2, m + R2 + L2 ); Loading Loading @@ -2960,7 +2956,8 @@ void IMDCT_ivas_fx( Word16 q_win = *pq_win; move16(); x_e_hdrm = sub( Q16, q_x ); IF ( q_win == -2 ) { IF( q_win == -2 ) { q_win = IMDCT_ivas_fx_adjust_qwin( *Q_syn_Overl_TDAC_fx, *Q_old_syn_overl_fx, hTcxDec->Q_old_syn_Overl, *q_old_out_fx, q_win ); } #else Loading Loading @@ -3062,9 +3059,12 @@ void IMDCT_ivas_fx( TCX_MDCT_Inverse_qwin_fx( x_fx + L_spec_TCX5_tmp, x_e_hdrm, win_fx, L_ola, sub( L_win, L_ola ), L_ola, st->element_mode, &q_win ); } if ( w > 0 ) { if ( w > 0 ) { assert( q_win_prev == q_win ); } else { } else { q_win_prev = q_win; } Loading lib_com/prot_fx.h +1 −1 File changed.Contains only whitespace changes. Show changes lib_dec/ivas_mdct_core_dec_fx.c +4 −4 File changed.Contains only whitespace changes. Show changes Loading
lib_dec/dec_tcx_fx.c +57 −57 Original line number Diff line number Diff line Loading @@ -2573,8 +2573,7 @@ void IMDCT_fx( Word32 *x, Word16 x_e, Word16 *old_syn_overl, Word16 *syn_Overl_T } #ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT_QWIN static Word16 IMDCT_ivas_fx_adjust_qwin( static Word16 IMDCT_ivas_fx_adjust_qwin( Word16 Q_syn_Overl_TDAC, Word16 Q_syn_Overl, Word16 Q_old_syn_Overl, Loading @@ -2589,8 +2588,7 @@ Word16 IMDCT_ivas_fx_adjust_qwin( return q_win; } static void IMDCT_ivas_fx_rescale( static void IMDCT_ivas_fx_rescale( Word16 *syn_Overl_TDAC, Word16 *Q_syn_Overl_TDAC, Word16 *syn_Overl, Loading @@ -2611,7 +2609,8 @@ void IMDCT_ivas_fx_rescale( oldLength = L_FRAME32k; move16(); if ( FB_flag ) { if ( FB_flag ) { oldLength = L_FRAME48k; move16(); } Loading Loading @@ -2675,8 +2674,7 @@ static Word16 TCX_MDCT_Inverse_GetScaleFactor( return factor; } static void TCX_MDCT_Inverse_qwin_fx( static void TCX_MDCT_Inverse_qwin_fx( Word32 *x, // Q( 31 - x_e ) Word16 x_e, Word16 *y, /* Qy */ Loading @@ -2684,8 +2682,7 @@ void TCX_MDCT_Inverse_qwin_fx( const Word16 m, /* Q0 */ const Word16 r, /* Q0 */ const Word16 element_mode, /* Q0 */ Word16 *q_win ) Word16 *q_win ) { Word16 i, fac, negfac, s; Loading @@ -2706,7 +2703,8 @@ void TCX_MDCT_Inverse_qwin_fx( negfac = negate( fac ); #if 1 IF ( *q_win == -2 ) { IF( *q_win == -2 ) { // x_e + q_win == L_norm_arr(tmp_buf, , *q_win ); // q_win = L_norm_arr(tmp_buf, , *q_win ) - x_e; s = L_norm_arr( tmp_buf + L2, m + R2 + L2 ); Loading Loading @@ -2743,16 +2741,14 @@ void TCX_MDCT_Inverse_qwin_fx( } } static void TCX_MDST_Inverse_qwin_fx( static void TCX_MDST_Inverse_qwin_fx( Word32 *x, /* exp(x_e) */ Word16 x_e, Word16 *y, /* Qx */ const Word16 l, /* Q0 */ const Word16 m, /* Q0 */ const Word16 r, /* Q0 */ Word16 *q_win ) Word16 *q_win ) { Word16 i, fac, negfac, s; Loading @@ -2775,7 +2771,8 @@ void TCX_MDST_Inverse_qwin_fx( negfac = negate( fac ); #if 1 IF ( *q_win == -2 ) { IF( *q_win == -2 ) { // x_e + q_win == L_norm_arr(tmp_buf, , *q_win ); // q_win = L_norm_arr(tmp_buf, , *q_win ) - x_e; s = L_norm_arr( tmp_buf + L2, m + R2 + L2 ); Loading Loading @@ -2817,8 +2814,7 @@ void TCX_MDST_Inverse_qwin_fx( * * *-------------------------------------------------------------------*/ static void TCX_MDXT_Inverse_qwin_fx( static void TCX_MDXT_Inverse_qwin_fx( const Word32 *x, /* exp(x_e) */ Word16 x_e, Word16 *y, /* Qx */ Loading @@ -2826,8 +2822,7 @@ void TCX_MDXT_Inverse_qwin_fx( const Word16 m, /* Q0 */ const Word16 r, /* Q0 */ const UWord16 kernel_type, /* Q0 */ Word16 *q_win ) Word16 *q_win ) { Word16 signLeft; Word16 signRight; Loading Loading @@ -2863,7 +2858,8 @@ void TCX_MDXT_Inverse_qwin_fx( } #if 1 IF ( *q_win == -2 ) { IF( *q_win == -2 ) { // x_e + q_win == L_norm_arr(tmp_buf, , *q_win ); // q_win = L_norm_arr(tmp_buf, , *q_win ) - x_e; s = L_norm_arr( tmp_buf + L2, m + R2 + L2 ); Loading Loading @@ -2960,7 +2956,8 @@ void IMDCT_ivas_fx( Word16 q_win = *pq_win; move16(); x_e_hdrm = sub( Q16, q_x ); IF ( q_win == -2 ) { IF( q_win == -2 ) { q_win = IMDCT_ivas_fx_adjust_qwin( *Q_syn_Overl_TDAC_fx, *Q_old_syn_overl_fx, hTcxDec->Q_old_syn_Overl, *q_old_out_fx, q_win ); } #else Loading Loading @@ -3062,9 +3059,12 @@ void IMDCT_ivas_fx( TCX_MDCT_Inverse_qwin_fx( x_fx + L_spec_TCX5_tmp, x_e_hdrm, win_fx, L_ola, sub( L_win, L_ola ), L_ola, st->element_mode, &q_win ); } if ( w > 0 ) { if ( w > 0 ) { assert( q_win_prev == q_win ); } else { } else { q_win_prev = q_win; } Loading