Commit 964c80d5 authored by Manuel Jander's avatar Manuel Jander
Browse files

Remove norm, improves test case... 

Remove norm, improves test case stv4ISM48n.wav_4_ISM_with_and_without_extended_metadata_bitrate_switching_from_24_4_kbps_to_256_kbps_48_kHz
parent 326588ce

lib_dec/ivas_svd_dec.c

+6 −7
Original line number Diff line number Diff line
@@ -1252,7 +1252,7 @@ IF( LT_16( currChannel, nChannelsL ) ) /* i <= m */ 
    IF( ( *sig_x ) ) /*(fabsf(*sig_x) > EPSILON * fabsf(*sig_x)) { */

    {

#ifdef FIX_1010_OPT_DIV

        Word16 invVal_e, temp_e;

        Word16 invVal_e;

        Word32 invVal = BASOP_Util_Inv32( maxWithSign_fx( *sig_x ), &invVal_e );

#endif

        norm_x = 0;
@@ -1263,16 +1263,15 @@ IF( LT_16( currChannel, nChannelsL ) ) /* i <= m */ 
        {

#ifndef FIX_1010_OPT_DIV

            singularVectors[jCh][currChannel] = BASOP_Util_Divide3232_Scale_cadence( singularVectors[jCh][currChannel], maxWithSign_fx( *sig_x ), &sing_exp[jCh] ); /* exp(sing_exp + (singularVectors_e - sig_x_e) */

            move32();

            sing_exp[jCh] = add( sing_exp[jCh], sub( *singularVectors_e, *sig_x_e ) );

            move16();

#else

            temp_e = norm_l( singularVectors[jCh][currChannel] );

            singularVectors[jCh][currChannel] = L_shl( singularVectors[jCh][currChannel], temp_e );

            singularVectors[jCh][currChannel] = Mpy_32_32( singularVectors[jCh][currChannel], invVal ); /* exp(sing_exp + (singularVectors_e - sig_x_e) */

            sing_exp[jCh] = sub( invVal_e, temp_e );

            move16();

#endif

            move32();

            sing_exp[jCh] = add( sing_exp[jCh], sub( *singularVectors_e, *sig_x_e ) );

            sing_exp[jCh] = add( invVal_e, sub( *singularVectors_e, *sig_x_e ) );

            move16();

#endif

            norm_x = BASOP_Util_Add_Mant32Exp( norm_x, norm_x_e, Mpy_32_32( singularVectors[jCh][currChannel], singularVectors[jCh][currChannel] ), shl( sing_exp[jCh], 1 ), &norm_x_e ); /* exp(norm_x_e) */

        }

        IF( GT_16( norm_x_e, 0 ) )