Commit 11307a29 authored by ber's avatar ber
Browse files

reactivated all fixes for 1072

parent 02f74073

lib_rend/ivas_dirac_dec_binaural_functions.c

+8 −10
Original line number Diff line number Diff line
@@ -3995,7 +3995,7 @@ static void chol2x2_fx( 
        IF( outRe[1][1] == 0 )

        {

            push_wmops( "DIV3232_0" );

#if !defined( FIX_1072_REPLACE_DIV_SQRT_BY_ISQRT ) || 1

#if !defined( FIX_1072_REPLACE_DIV_SQRT_BY_ISQRT )

            outRe[0][1] = BASOP_Util_Divide3232_Scale_cadence( c_re, 4611686, &exp );

            move32();

            q_re2 = add( sub( 31, exp ), sub( q_c, 62 ) );
@@ -4004,13 +4004,12 @@ static void chol2x2_fx( 
            move32();

            q_im = add( sub( 31, exp ), sub( q_c, 62 ) );



#else /*ALternative code has to be verified, first*/

            CDK_ASSERT( 0 );

#else 

            // outRe[0][1] = BASOP_Util_Divide3232_Scale_cadence( c_re, 4611686, &exp );

            Word32 tmp1 = 1953125005;

            Word32 tmp1 = 1953125005; /* 1/4611686 Q62 */

            exp = 9;

            outRe[0][1] = Mpy_32_32( tmp1, c_re );



            outRe[0][1] = Mpy_32_32( tmp1, c_re );

            move32();

            q_re2 = add( sub( 31, exp ), sub( q_c, 62 ) );
@@ -4023,7 +4022,7 @@ static void chol2x2_fx( 
        }

        ELSE

        {

#if !defined( FIX_1072_REPLACE_DIV_SQRT_BY_ISQRT ) || 1

#if !defined( FIX_1072_REPLACE_DIV_SQRT_BY_ISQRT )

            outRe[0][1] = BASOP_Util_Divide3232_Scale_cadence( c_re, outRe[1][1], &exp );

            move32();

            q_re2 = add( sub( 31, exp ), sub( q_c, q_re1 ) );
@@ -4031,9 +4030,8 @@ static void chol2x2_fx( 
            outIm[0][1] = BASOP_Util_Divide3232_Scale_cadence( -c_im, outRe[1][1], &exp );

            move32();

            q_im = add( sub( 31, exp ), sub( q_c, q_re1 ) );

#else /*alternative code has to be verified, first*/

#else

            {

                CDK_ASSERT( 0 );

                // outRe[0][1] = BASOP_Util_Divide3232_Scale_cadence( c_re, outRe[1][1], &exp );

                Word32 tmp1 = BASOP_Util_Divide3232_Scale_cadence( 0x7FFFFFFF, outRe[1][1], &exp );

                outRe[0][1] = Mpy_32_32( tmp1, c_re );
@@ -4429,7 +4427,7 @@ static void formulate2x2MixingMatrix_fx( 


    eig2x2_fx( tmpRe_fx[0][0], tmpRe_fx[1][1], q_temp, tmpRe_fx[1][0], tmpIm_fx[1][0], q_temp, Ure_fx, Uim_fx, &q_U, D_fx, &q_D );



#if defined( FIX_1072_REPLACE_DIV_SQRT_BY_ISQRT ) && 0 /*deactivate for pipe tests*/

#if defined( FIX_1072_REPLACE_DIV_SQRT_BY_ISQRT )

    IF( D_fx[0] == 0 )

    {

        temp = 2047986068;
@@ -4458,7 +4456,7 @@ static void formulate2x2MixingMatrix_fx( 
    move32();

#endif /*FIX_1072_REPLACE_DIV_SQRT_BY_ISQRT*/



#if defined( FIX_1072_REPLACE_DIV_SQRT_BY_ISQRT ) && 0 /*deactivate for pip tests*/

#if defined( FIX_1072_REPLACE_DIV_SQRT_BY_ISQRT )

    IF( D_fx[1] == 0 )

    {

        temp = 2047986068;