Commit 929bbcea authored by multrus's avatar multrus Committed by Manuel Jander
Browse files

replace BASOP_Util_Divide3232_Scale_cadence() by BASOP_Util_Divide3232_Scale_newton()

parent 9e052200

lib_dec/ivas_lfe_plc_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static Word16 lfeplc_lev_dur_fx( 
        s = W_extract_h( W_shl( s_fx, exp1 ) );

        s_q_fx = sub( add( s_q_fx, exp1 ), 32 );



        rc_fx[i - 1] = L_shr( BASOP_Util_Divide3232_Scale_cadence( L_negate( s ), err_fx, &temp_q2 ), 1 );

        rc_fx[i - 1] = L_shr( BASOP_Util_Divide3232_Scale_newton( L_negate( s ), err_fx, &temp_q2 ), 1 );

        move32();

        rc_q_fx[i - 1] = sub( add( sub( s_q_fx, err_q_fx ), sub( 31, temp_q2 ) ), 1 );

        move16();

lib_dec/ivas_svd_dec_fx.c

+7 −7
Original line number Diff line number Diff line
@@ -917,7 +917,7 @@ static void biDiagonalReductionLeft_fx( 
        {

            Word16 invVal_e;

            Word32 invVal;

            invVal = BASOP_Util_Divide3232_Scale_cadence( MAXVAL_WORD32, maxWithSign_fx( *sig_x ), &invVal_e );

            invVal = BASOP_Util_Divide3232_Scale_newton( MAXVAL_WORD32, maxWithSign_fx( *sig_x ), &invVal_e );

            norm_x = 0;

            move32();

            norm_x_e = 0;
@@ -954,7 +954,7 @@ static void biDiagonalReductionLeft_fx( 
            singularVectors[currChannel][idx] = BASOP_Util_Add_Mant32Exp( singularVectors[currChannel][idx], singularVectors2_e[currChannel][idx], -( *g ), 0, &singularVectors2_e[currChannel][idx] ); /* sing_exp */

            move32();



            invVal = BASOP_Util_Divide3232_Scale_cadence( MAXVAL_WORD32, maxWithSign_fx( r ), &invVal_e );

            invVal = BASOP_Util_Divide3232_Scale_newton( MAXVAL_WORD32, maxWithSign_fx( r ), &invVal_e );



            FOR( iCh = currChannel + 1; iCh < nChannelsC; iCh++ ) /* nChannelsC */

            {
@@ -1046,7 +1046,7 @@ static void biDiagonalReductionRight_fx( 


            Word16 invVal_e, temp_e;

            Word32 invVal;

            invVal = BASOP_Util_Divide3232_Scale_cadence( MAXVAL_WORD32, maxWithSign_fx( *sig_x ), &invVal_e );

            invVal = BASOP_Util_Divide3232_Scale_newton( MAXVAL_WORD32, maxWithSign_fx( *sig_x ), &invVal_e );

            FOR( jCh = idx; jCh < nChannelsC; jCh++ ) /*nChannelsC */

            {

                temp_e = norm_l( singularVectors[currChannel][jCh] );
@@ -1082,7 +1082,7 @@ static void biDiagonalReductionRight_fx( 
            singularVectors[currChannel][idx] = BASOP_Util_Add_Mant32Exp( singularVectors[currChannel][idx], singularVectors2_e[currChannel][idx], -( *g ), 0, &singularVectors2_e[currChannel][idx] ); /* exp(sing_exp) */

            move32();



            invVal = BASOP_Util_Divide3232_Scale_cadence( MAXVAL_WORD32, maxWithSign_fx( r ), &invVal_e );

            invVal = BASOP_Util_Divide3232_Scale_newton( MAXVAL_WORD32, maxWithSign_fx( r ), &invVal_e );



            FOR( jCh = idx; jCh < nChannelsC; jCh++ ) /* nChannelsC */

            {
@@ -1162,7 +1162,7 @@ static void singularVectorsAccumulationLeft_fx( 


        IF( t_ii ) /*if (fabsf(t_ii) > EPSILON *fabsf(t_ii)) {*/

        {

            t_ii = BASOP_Util_Divide3232_Scale_cadence( MAXVAL_WORD32, maxWithSign_fx( t_ii ), &temp_exp );

            t_ii = BASOP_Util_Divide3232_Scale_newton( MAXVAL_WORD32, maxWithSign_fx( t_ii ), &temp_exp );

            t_ii_e = sub( temp_exp, t_ii_e );

            Word16 tempe;

            Word32 temp = BASOP_Util_Divide3232_Scale_newton( t_ii, maxWithSign_fx( singularVectors_Left[nCh][nCh] ), &tempe );