Commit a3d7e73c authored by Fabian Bauer's avatar Fabian Bauer
Browse files

cldfb_fx.c : replaced all overflow basops

parent 2cc44d9a

lib_com/cldfb_fx.c

+6 −4
Original line number Diff line number Diff line
@@ -1816,9 +1816,11 @@ static void GetEnergyCldfb_ivas_fx( Word32 *energyLookahead, /*!< o: Q(*sf_e 
    Word32 energyValues[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];

    Word16 energyValuesSumE[CLDFB_NO_CHANNELS_MAX];

    // Word16 freqTable[2] = {20, 40};

#ifndef ISSUE_1836_replace_overflow_libcom

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();

#endif

#endif



    FOR( k = 0; k < numberCols; k++ )
@@ -1905,8 +1907,8 @@ static void GetEnergyCldfb_ivas_fx( Word32 *energyLookahead, /*!< o: Q(*sf_e 
        {

            FOR( j = 20; j < numberBandsM; j++ )

            {

#ifdef ISSUE_1799_replace_L_shr_o

                nrg = L_add_o( nrg, L_shr_sat( energyValues[k][j], s ), &Overflow );

#ifdef ISSUE_1836_replace_overflow_libcom

                nrg = L_add_sat( nrg, L_shr_sat( energyValues[k][j], s ) );

#else

                nrg = L_add_o( nrg, L_shr_o( energyValues[k][j], s, &Overflow ), &Overflow );

#endif
@@ -1932,8 +1934,8 @@ static void GetEnergyCldfb_ivas_fx( Word32 *energyLookahead, /*!< o: Q(*sf_e 
        {

            FOR( j = 20; j < numberBandsM; j++ )

            {

#ifdef ISSUE_1799_replace_L_shr_o

                nrg = L_add_o( nrg, L_shr_sat( energyValues[k][j], s ), &Overflow );

#ifdef ISSUE_1836_replace_overflow_libcom

                nrg = L_add_sat( nrg, L_shr_sat( energyValues[k][j], s ) );

#else

                nrg = L_add_o( nrg, L_shr_o( energyValues[k][j], s, &Overflow ), &Overflow );

#endif