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

Commit 05716aa0 authored by Jason Sams's avatar Jason Sams
Browse files

Update image processing to cleaup code by not inlining 

functions that should be handled by the runtime.

Change-Id: I54c590913285bceb02a9076dbe6355d6f6bc6661
parent fce21b5a

libs/rs/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs

+4 −34
Original line number Diff line number Diff line
@@ -8,52 +8,22 @@ void root(const void *v_in, void *v_out, const void *usrData, uint32_t x, uint32 
    const uchar4 *input = (const uchar4 *)rsGetElementAt(fs->ain, x, 0);



    float3 blurredPixel = 0;

    float3 currentPixel = 0;



    const float *gPtr = fs->gaussian;

    if ((y > fs->radius) && (y < (fs->height - fs->radius))) {

        const uchar4 *i = input + ((y - fs->radius) * fs->width);

        for(int r = -fs->radius; r <= fs->radius; r ++) {

            currentPixel.x = (float)(i->x);

            currentPixel.y = (float)(i->y);

            currentPixel.z = (float)(i->z);

            blurredPixel += currentPixel * gPtr[0];

            blurredPixel += convert_float3(i->xyz) * gPtr[0];

            gPtr++;

            i += fs->width;

        }

    } else {

        for(int r = -fs->radius; r <= fs->radius; r ++) {

    #if 1

            int validH = y + r;

            // Clamp to zero and width

            if(validH < 0) {

                validH = 0;

            }

            if(validH > fs->height - 1) {

                validH = fs->height - 1;

            }



            int validH = rsClamp(y + r, (uint)0, (uint)(fs->height - 1));

            const uchar4 *i = input + validH * fs->width;

            //const uchar4 *i = (const uchar4 *)rsGetElementAt(fs->ain, x, validH);



            currentPixel.x = (float)(i->x);

            currentPixel.y = (float)(i->y);

            currentPixel.z = (float)(i->z);

            blurredPixel += currentPixel * gPtr[0];

            gPtr++;

    #else

            int validH = rsClamp(y + r, 0, height - 1);

            validH -= y;

            uchar4 *i = input + validH * width + x;

            blurredPixel.xyz += convert_float3(i->xyz) * gPtr[0];

            blurredPixel += convert_float3(i->xyz) * gPtr[0];

            gPtr++;

    #endif

        }

    }



    //output->xyz = convert_uchar3(blurredPixel.xyz);

    output->x = (uint8_t)blurredPixel.x;

    output->y = (uint8_t)blurredPixel.y;

    output->z = (uint8_t)blurredPixel.z;

    output->xyz = convert_uchar3(blurredPixel);

}