Loading lib_enc/corr_xh_fx.c +4 −4 Original line number Diff line number Diff line Loading @@ -161,11 +161,11 @@ void corr_xh_ivas_fx2( L_maxloc = L_deposit_l(0); FOR(i = k; i < L_subfr; i += STEP) { L_tmp = L_mac(1L, x[i], h[0]); /* 1 -> to avoid null dn[] */ L_tmp = L_mac(1L, x[i], h[0]); /* 1 -> to avoid null dn[] */ //Qx+(15 - norm_s(h[0])) FOR(j = i; j < L_subfr - 1; j++) { #ifdef BASOP_NOGLOB L_tmp = L_mac_o(L_tmp, x[j + 1], h[j + 1 - i], &Overflow); L_tmp = L_mac_o(L_tmp, x[j + 1], h[j + 1 - i], &Overflow); //Qx+(15 - norm_s(h[0])) #else L_tmp = L_mac(L_tmp, x[j + 1], h[j + 1 - i]); #endif Loading Loading @@ -194,9 +194,9 @@ void corr_xh_ivas_fx2( FOR(i = 0; i < L_subfr; i++) { dn[i] = round_fx(L_shl(y32[i], j)); dn[i] = round_fx(L_shl(y32[i], j)); //Qx+(15 - norm_s(h[0])) +j - 16 } *Qdn = add(j, add(Qx,16-norm_s(h[0])) + 1) - 16; *Qdn = sub(add(add(Qx,sub(15, norm_s(h[0]))),j),16); return; } No newline at end of file lib_enc/enc_uv_fx.c +1 −1 Original line number Diff line number Diff line Loading @@ -381,7 +381,7 @@ void encod_unvoiced_ivas_fx( #else Mode2_gp_clip( st_fx->voicing_fx, i_subfr, st_fx->coder_type, xn_fx, st_fx->clip_var_fx, L_SUBFR, Q_xn ); #endif *pt_pitch_fx = L_SUBFR; *pt_pitch_fx = L_SUBFR << 6; move16(); /*----------------------------------------------------------------------* * Encode the algebraic innovation * Loading Loading
lib_enc/corr_xh_fx.c +4 −4 Original line number Diff line number Diff line Loading @@ -161,11 +161,11 @@ void corr_xh_ivas_fx2( L_maxloc = L_deposit_l(0); FOR(i = k; i < L_subfr; i += STEP) { L_tmp = L_mac(1L, x[i], h[0]); /* 1 -> to avoid null dn[] */ L_tmp = L_mac(1L, x[i], h[0]); /* 1 -> to avoid null dn[] */ //Qx+(15 - norm_s(h[0])) FOR(j = i; j < L_subfr - 1; j++) { #ifdef BASOP_NOGLOB L_tmp = L_mac_o(L_tmp, x[j + 1], h[j + 1 - i], &Overflow); L_tmp = L_mac_o(L_tmp, x[j + 1], h[j + 1 - i], &Overflow); //Qx+(15 - norm_s(h[0])) #else L_tmp = L_mac(L_tmp, x[j + 1], h[j + 1 - i]); #endif Loading Loading @@ -194,9 +194,9 @@ void corr_xh_ivas_fx2( FOR(i = 0; i < L_subfr; i++) { dn[i] = round_fx(L_shl(y32[i], j)); dn[i] = round_fx(L_shl(y32[i], j)); //Qx+(15 - norm_s(h[0])) +j - 16 } *Qdn = add(j, add(Qx,16-norm_s(h[0])) + 1) - 16; *Qdn = sub(add(add(Qx,sub(15, norm_s(h[0]))),j),16); return; } No newline at end of file
lib_enc/enc_uv_fx.c +1 −1 Original line number Diff line number Diff line Loading @@ -381,7 +381,7 @@ void encod_unvoiced_ivas_fx( #else Mode2_gp_clip( st_fx->voicing_fx, i_subfr, st_fx->coder_type, xn_fx, st_fx->clip_var_fx, L_SUBFR, Q_xn ); #endif *pt_pitch_fx = L_SUBFR; *pt_pitch_fx = L_SUBFR << 6; move16(); /*----------------------------------------------------------------------* * Encode the algebraic innovation * Loading