Loading lib_enc/ivas_core_enc_fx.c +2 −16 Original line number Diff line number Diff line Loading @@ -698,25 +698,12 @@ ivas_error ivas_core_enc_fx( /* Common pre-processing for SWB(FB) TBE and SWB(FB) BWE */ /* Scaling cldfb_state_fx */ #ifdef FIX_2021_BANDWIDTH_EXTENSION_PROBLEM Word16 shift, scf_cldfb, scf_min = 31; move16(); FOR( int i = 0; i < CLDFB_NO_COL_MAX; i++ ) { scf_min = s_min( scf_min, L_norm_arr( realBuffer_fx[n][i], CLDFB_NO_CHANNELS_MAX ) ); scf_min = s_min( scf_min, L_norm_arr( imagBuffer_fx[n][i], CLDFB_NO_CHANNELS_MAX ) ); } FOR( int i = 0; i < CLDFB_NO_COL_MAX; i++ ) { scale_sig32( realBuffer_fx[n][i], CLDFB_NO_CHANNELS_MAX, scf_min ); scale_sig32( imagBuffer_fx[n][i], CLDFB_NO_CHANNELS_MAX, scf_min ); } q_re_im_buf[n] = add( q_re_im_buf[n], scf_min ); Word16 shift, scf_cldfb; scf_cldfb = L_norm_arr( st->cldfbSynTd->cldfb_state_fx, st->cldfbSynTd->p_filter_length ); IF( NE_32( scf_cldfb, 31 ) ) { scale_sig32( st->cldfbSynTd->cldfb_state_fx, st->cldfbSynTd->p_filter_length, scf_cldfb ); // st->cldfbSynTd->Q_cldfb_state -> q_realImagBuffer scale_sig32( st->cldfbSynTd->cldfb_state_fx, st->cldfbSynTd->p_filter_length, scf_cldfb ); st->cldfbSynTd->Q_cldfb_state = add( st->cldfbSynTd->Q_cldfb_state, scf_cldfb ); shift = sub( st->cldfbSynTd->Q_cldfb_state, sub( q_re_im_buf[n], 1 ) ); Loading @@ -735,7 +722,6 @@ ivas_error ivas_core_enc_fx( st->cldfbSynTd->Q_cldfb_state = q_re_im_buf[n]; } } #else scale_sig32( st->cldfbSynTd->cldfb_state_fx, st->cldfbSynTd->p_filter_length, sub( q_re_im_buf[n], st->cldfbSynTd->Q_cldfb_state ) ); // st->cldfbSynTd->Q_cldfb_state -> q_realImagBuffer #endif Loading Loading
lib_enc/ivas_core_enc_fx.c +2 −16 Original line number Diff line number Diff line Loading @@ -698,25 +698,12 @@ ivas_error ivas_core_enc_fx( /* Common pre-processing for SWB(FB) TBE and SWB(FB) BWE */ /* Scaling cldfb_state_fx */ #ifdef FIX_2021_BANDWIDTH_EXTENSION_PROBLEM Word16 shift, scf_cldfb, scf_min = 31; move16(); FOR( int i = 0; i < CLDFB_NO_COL_MAX; i++ ) { scf_min = s_min( scf_min, L_norm_arr( realBuffer_fx[n][i], CLDFB_NO_CHANNELS_MAX ) ); scf_min = s_min( scf_min, L_norm_arr( imagBuffer_fx[n][i], CLDFB_NO_CHANNELS_MAX ) ); } FOR( int i = 0; i < CLDFB_NO_COL_MAX; i++ ) { scale_sig32( realBuffer_fx[n][i], CLDFB_NO_CHANNELS_MAX, scf_min ); scale_sig32( imagBuffer_fx[n][i], CLDFB_NO_CHANNELS_MAX, scf_min ); } q_re_im_buf[n] = add( q_re_im_buf[n], scf_min ); Word16 shift, scf_cldfb; scf_cldfb = L_norm_arr( st->cldfbSynTd->cldfb_state_fx, st->cldfbSynTd->p_filter_length ); IF( NE_32( scf_cldfb, 31 ) ) { scale_sig32( st->cldfbSynTd->cldfb_state_fx, st->cldfbSynTd->p_filter_length, scf_cldfb ); // st->cldfbSynTd->Q_cldfb_state -> q_realImagBuffer scale_sig32( st->cldfbSynTd->cldfb_state_fx, st->cldfbSynTd->p_filter_length, scf_cldfb ); st->cldfbSynTd->Q_cldfb_state = add( st->cldfbSynTd->Q_cldfb_state, scf_cldfb ); shift = sub( st->cldfbSynTd->Q_cldfb_state, sub( q_re_im_buf[n], 1 ) ); Loading @@ -735,7 +722,6 @@ ivas_error ivas_core_enc_fx( st->cldfbSynTd->Q_cldfb_state = q_re_im_buf[n]; } } #else scale_sig32( st->cldfbSynTd->cldfb_state_fx, st->cldfbSynTd->p_filter_length, sub( q_re_im_buf[n], st->cldfbSynTd->Q_cldfb_state ) ); // st->cldfbSynTd->Q_cldfb_state -> q_realImagBuffer #endif Loading