Loading lib_com/ivas_spar_com_fx.c +6 −10 Original line number Diff line number Diff line Loading @@ -4264,7 +4264,7 @@ void ivas_get_spar_md_from_dirac_enc_fx( Word16 norm_q; #ifdef NONBE_FIX_1748_SPAR_DIV_OPT Word16 num_ch_order, norm_t; Word16 num_ch_order, norm_t, tmp_e; #else Word16 num_ch_order, hoa2_ch_order; #endif Loading @@ -4291,9 +4291,7 @@ void ivas_get_spar_md_from_dirac_enc_fx( /*normalize 1st order*/ #ifdef NONBE_FIX_1748_SPAR_DIV_OPT norm_t = L_norm_arr( &response_avg_fx[1], sub( foa_ch, 1 ) ); move16(); norm_t = sub( norm_t, 1 ); move16(); scale_sig32( &response_avg_fx[1], sub( foa_ch, 1 ), norm_t ); #endif norm_fx = 0; Loading Loading @@ -4343,9 +4341,9 @@ void ivas_get_spar_md_from_dirac_enc_fx( { FOR( ch = 1; ch < foa_ch; ch++ ) { response_avg_fx[ch] = divide3232( response_avg_fx[ch], L_max( norm_fx, response_avg_fx[ch] ) ); // q15 response_avg_fx[ch] = BASOP_Util_Divide3232_Scale_newton( response_avg_fx[ch], L_max( norm_fx, response_avg_fx[ch] ), &tmp_e ); // Q31 - tmp_e move32(); response_avg_fx[ch] = L_shl( response_avg_fx[ch], 15 ); // q30 response_avg_fx[ch] = L_shl( response_avg_fx[ch], sub( tmp_e, Q1 ) ); // q30 move32(); } } Loading Loading @@ -4869,7 +4867,7 @@ void ivas_get_spar_md_from_dirac_fx( Word32 norm_fx; Word16 norm_q; #ifdef NONBE_FIX_1748_SPAR_DIV_OPT Word16 num_ch_order, norm_t; Word16 num_ch_order, norm_t, tmp_e; #else Word16 num_ch_order, hoa2_ch_order; #endif Loading @@ -4896,9 +4894,7 @@ void ivas_get_spar_md_from_dirac_fx( /*normalize 1st order*/ #ifdef NONBE_FIX_1748_SPAR_DIV_OPT norm_t = L_norm_arr( &response_avg_fx[1], sub( foa_ch, 1 ) ); move16(); norm_t = sub( norm_t, 1 ); move16(); scale_sig32( &response_avg_fx[1], sub( foa_ch, 1 ), norm_t ); #endif norm_fx = 0; Loading Loading @@ -4950,9 +4946,9 @@ void ivas_get_spar_md_from_dirac_fx( { FOR( ch = 1; ch < foa_ch; ch++ ) { response_avg_fx[ch] = divide3232( response_avg_fx[ch], L_max( norm_fx, response_avg_fx[ch] ) ); // q15 response_avg_fx[ch] = BASOP_Util_Divide3232_Scale_newton( response_avg_fx[ch], L_max( norm_fx, response_avg_fx[ch] ), &tmp_e ); // Q31 - tmp_e move32(); response_avg_fx[ch] = L_shl( response_avg_fx[ch], 15 ); // q30 response_avg_fx[ch] = L_shl( response_avg_fx[ch], sub( tmp_e, Q1 ) ); // q30 move32(); } } Loading Loading
lib_com/ivas_spar_com_fx.c +6 −10 Original line number Diff line number Diff line Loading @@ -4264,7 +4264,7 @@ void ivas_get_spar_md_from_dirac_enc_fx( Word16 norm_q; #ifdef NONBE_FIX_1748_SPAR_DIV_OPT Word16 num_ch_order, norm_t; Word16 num_ch_order, norm_t, tmp_e; #else Word16 num_ch_order, hoa2_ch_order; #endif Loading @@ -4291,9 +4291,7 @@ void ivas_get_spar_md_from_dirac_enc_fx( /*normalize 1st order*/ #ifdef NONBE_FIX_1748_SPAR_DIV_OPT norm_t = L_norm_arr( &response_avg_fx[1], sub( foa_ch, 1 ) ); move16(); norm_t = sub( norm_t, 1 ); move16(); scale_sig32( &response_avg_fx[1], sub( foa_ch, 1 ), norm_t ); #endif norm_fx = 0; Loading Loading @@ -4343,9 +4341,9 @@ void ivas_get_spar_md_from_dirac_enc_fx( { FOR( ch = 1; ch < foa_ch; ch++ ) { response_avg_fx[ch] = divide3232( response_avg_fx[ch], L_max( norm_fx, response_avg_fx[ch] ) ); // q15 response_avg_fx[ch] = BASOP_Util_Divide3232_Scale_newton( response_avg_fx[ch], L_max( norm_fx, response_avg_fx[ch] ), &tmp_e ); // Q31 - tmp_e move32(); response_avg_fx[ch] = L_shl( response_avg_fx[ch], 15 ); // q30 response_avg_fx[ch] = L_shl( response_avg_fx[ch], sub( tmp_e, Q1 ) ); // q30 move32(); } } Loading Loading @@ -4869,7 +4867,7 @@ void ivas_get_spar_md_from_dirac_fx( Word32 norm_fx; Word16 norm_q; #ifdef NONBE_FIX_1748_SPAR_DIV_OPT Word16 num_ch_order, norm_t; Word16 num_ch_order, norm_t, tmp_e; #else Word16 num_ch_order, hoa2_ch_order; #endif Loading @@ -4896,9 +4894,7 @@ void ivas_get_spar_md_from_dirac_fx( /*normalize 1st order*/ #ifdef NONBE_FIX_1748_SPAR_DIV_OPT norm_t = L_norm_arr( &response_avg_fx[1], sub( foa_ch, 1 ) ); move16(); norm_t = sub( norm_t, 1 ); move16(); scale_sig32( &response_avg_fx[1], sub( foa_ch, 1 ), norm_t ); #endif norm_fx = 0; Loading Loading @@ -4950,9 +4946,9 @@ void ivas_get_spar_md_from_dirac_fx( { FOR( ch = 1; ch < foa_ch; ch++ ) { response_avg_fx[ch] = divide3232( response_avg_fx[ch], L_max( norm_fx, response_avg_fx[ch] ) ); // q15 response_avg_fx[ch] = BASOP_Util_Divide3232_Scale_newton( response_avg_fx[ch], L_max( norm_fx, response_avg_fx[ch] ), &tmp_e ); // Q31 - tmp_e move32(); response_avg_fx[ch] = L_shl( response_avg_fx[ch], 15 ); // q30 response_avg_fx[ch] = L_shl( response_avg_fx[ch], sub( tmp_e, Q1 ) ); // q30 move32(); } } Loading