Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc303ed5 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by android code review
Browse files

Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"

parents 61d07fbe f27422a7

media/libstagefright/codecs/amrnb/enc/src/ton_stab.cpp

+2 −1
Original line number Diff line number Diff line
@@ -791,7 +791,8 @@ void update_gp_clipping(tonStabState *st, /* i/o : State struct */ 
                       )

{

    OSCL_UNUSED_ARG(pOverflow);

    for (int i = 0; i < N_FRAME - 1; i++)

    int i;

    for (i = 0; i < N_FRAME - 1; i++)

    {

        st->gp[i] = st->gp[i+1];

    }

media/libstagefright/codecs/amrwb/src/get_amr_wb_bits.cpp

+2 −1
Original line number Diff line number Diff line
@@ -119,8 +119,9 @@ int16 Serial_parm( /* Return the parameter */ 
)

{

    int16 value = 0;

    int16 i;



    for (int16 i = no_of_bits >> 1; i != 0; i--)

    for (i = no_of_bits >> 1; i != 0; i--)

    {

        value <<= 2;

media/libstagefright/codecs/amrwb/src/oversamp_12k8_to_16k.cpp

+2 −2
Original line number Diff line number Diff line
@@ -240,11 +240,11 @@ void AmrWbUp_samp( 
{



    int32 i;

    int16 frac;

    int16 frac, j;

    int16 * pt_sig_u = sig_u;



    frac = 1;

    for (int16 j = 0; j < L_frame; j++)

    for (j = 0; j < L_frame; j++)

    {

        i = ((int32)j * INV_FAC5) >> 13;       /* integer part = pos * 1/5 */