Commit cdf00750 authored by Arash Azizi's avatar Arash Azizi
Browse files

issue 2615: Wrapping all changes in one switch use. getting rid of the... 

issue 2615: Wrapping all changes in one switch use. getting rid of the conditional since it needs to shift to achieve final Q value
parent d842ad19

lib_dec/ivas_stereo_dft_plc_fx.c

+21 −19
Original line number Diff line number Diff line
@@ -793,6 +793,7 @@ Word32 stereo_dft_dmx_swb_nrg_fx( 
    dmx_nrg = EPSILON_FIX;

    move32();

    test();

#ifndef FIX_ISSUE_2615_FALSE_SHIFTING

    IF(q0 == 0 && q1 == 0)

    {

        FOR(i = 0; i < frame_length / 2; i++)
@@ -807,20 +808,21 @@ Word32 stereo_dft_dmx_swb_nrg_fx( 
    {

        FOR(i = 0; i < frame_length / 2; i++)

        {

#ifndef FIX_ISSUE_2615_FALSE_SHIFTING

            dmx_nrg = L_add(dmx_nrg,

                             L_shr(L_add(L_shl(Madd_32_32(Mpy_32_32(dmx_k0[2 * i], dmx_k0[2 * i]), dmx_k0[2 * i + 1], dmx_k0[2 * i + 1]), q0),

                                           L_shl(Madd_32_32(Mpy_32_32(dmx_k1[2 * i], dmx_k1[2 * i]), dmx_k1[2 * i + 1], dmx_k1[2 * i + 1]), q1)),

                                    1)); /*3*q0 - 31*/

        }

    }

#else

    FOR(i = 0; i < frame_length / 2; i++)

    {

        dmx_nrg = L_add(dmx_nrg,

            L_shr(L_add(L_shl(Madd_32_32(Mpy_32_32(dmx_k0[2 * i], dmx_k0[2 * i]), dmx_k0[2 * i + 1], dmx_k0[2 * i + 1]), (q_dft - q0) << 1),

                L_shl(Madd_32_32(Mpy_32_32(dmx_k1[2 * i], dmx_k1[2 * i]), dmx_k1[2 * i + 1], dmx_k1[2 * i + 1]), (q_dft - q1) << 1)),

                                    1 ) ); /*3*q0 - 31*/

#endif // !FIX_ISSUE_2615_FALSE_SHIFTING

        }

                1)); /* Q(2*q_dft)*/

    }



#endif // !FIX_ISSUE_2615_FALSE_SHIFTING

    return dmx_nrg;

}