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

Commit d4c6052d authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 096d72a3: Merge "AArch64: Correction for LP64" 

* commit '096d72a3':
  AArch64: Correction for LP64
parents e0a76795 096d72a3

media/libstagefright/codecs/on2/h264dec/source/h264bsd_intra_prediction.c

+5 −5
Original line number Diff line number Diff line
@@ -1110,7 +1110,7 @@ void Intra16x16PlanePrediction(u8 *data, u8 *above, u8 *left) 


/* Variables */



    u32 i, j;

    i32 i, j;

    i32 a, b, c;

    i32 tmp;
@@ -1123,20 +1123,20 @@ void Intra16x16PlanePrediction(u8 *data, u8 *above, u8 *left) 
    a = 16 * (above[15] + left[15]);



    for (i = 0, b = 0; i < 8; i++)

        b += ((i32)i + 1) * (above[8+i] - above[6-i]);

        b += (i + 1) * (above[8+i] - above[6-i]);

    b = (5 * b + 32) >> 6;



    for (i = 0, c = 0; i < 7; i++)

        c += ((i32)i + 1) * (left[8+i] - left[6-i]);

        c += (i + 1) * (left[8+i] - left[6-i]);

    /* p[-1,-1] has to be accessed through above pointer */

    c += ((i32)i + 1) * (left[8+i] - above[-1]);

    c += (i + 1) * (left[8+i] - above[-1]);

    c = (5 * c + 32) >> 6;



    for (i = 0; i < 16; i++)

    {

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

        {

            tmp = (a + b * ((i32)j - 7) + c * ((i32)i - 7) + 16) >> 5;

            tmp = (a + b * (j - 7) + c * (i - 7) + 16) >> 5;

            data[i*16+j] = (u8)CLIP1(tmp);

        }

    }