Commit d0617a4f authored by thomas dettbarn's avatar thomas dettbarn
Browse files

clean up of the "magic shift" definition.

parent 31a19c20

lib_dec/ivas_svd_dec_fx.c

+8 −8
Original line number Diff line number Diff line
@@ -1004,9 +1004,9 @@ static void biDiagonalReductionLeft_64( 
{



#define HEADROOM_LEFT_1 2

#define HEADROOM_LEFT_2 ( 16 - norm_x_e0 / 4 ) // 12

#define HEADROOM_LEFT_3 ( 16 - norm_x_e0 / 4 ) // 14

#define HEADROOM_LEFT_4 ( 16 - norm_x_e0 / 4 ) // 15

#define HEADROOM_LEFT_2 ( 16 - norm_x_e0 / 4 ) //  10

#define HEADROOM_LEFT_3 ( 16 - norm_x_e0 / 4 ) //  4

#define HEADROOM_LEFT_4 ( 16 - norm_x_e0 / 4 ) //  14



    Word16 iCh, jCh;

    Word32 norm_x;
@@ -1085,7 +1085,7 @@ static void biDiagonalReductionLeft_64( 
            norm_x_e = W_norm( norm_64 );

            norm_x = W_extract_h( W_shl( norm_64, norm_x_e ) );

            f = Mpy_32_32( norm_x, invVal );

            magic_shift = norm_x_e - r_e + ( 30 + 2 * HEADROOM_LEFT_1 - 2 * HEADROOM_LEFT_3 - HEADROOM_LEFT_4 );

            magic_shift = ( norm_x_e - 2 * HEADROOM_LEFT_3 ) - ( r_e - HEADROOM_LEFT_1 ) + ( 32 - HEADROOM_LEFT_4 );

            FOR( jCh = currChannel; jCh < nChannelsL; jCh++ )

            {

                factor1 = W_extract_h( W_shl( singularVectors_Left_64[jCh][currChannel], 32 - HEADROOM_LEFT_4 ) );
@@ -1117,9 +1117,9 @@ static void biDiagonalReductionRight_64( 
    Word16 idx;



#define HEADROOM_RIGHT_1 2

#define HEADROOM_RIGHT_2 ( 16 - norm_x_e0 / 4 ) // 12

#define HEADROOM_RIGHT_3 ( 16 - norm_x_e0 / 4 ) // 14

#define HEADROOM_RIGHT_4 ( 16 - norm_x_e0 / 4 ) // 15

#define HEADROOM_RIGHT_2 ( 16 - norm_x_e0 / 4 )	// 10

#define HEADROOM_RIGHT_3 ( 16 - norm_x_e0 / 4 )	// 4

#define HEADROOM_RIGHT_4 ( 16 - norm_x_e0 / 4 )	// 14





    ( *g ) = 0;
@@ -1195,7 +1195,7 @@ static void biDiagonalReductionRight_64( 
                norm_x_e = W_norm( norm_64 );

                norm_x = W_extract_h( W_shl( norm_64, norm_x_e ) );

                f = Mpy_32_32( norm_x, invVal );

                magic_shift = norm_x_e - r_e + ( 30 + 2 * HEADROOM_RIGHT_1 - 2 * HEADROOM_RIGHT_3 - HEADROOM_RIGHT_4 );

                magic_shift = ( norm_x_e - 2 * HEADROOM_RIGHT_3 ) - ( r_e - HEADROOM_RIGHT_1 ) + ( 32 - HEADROOM_RIGHT_4 );



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

                {