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

Commit cb1fcded authored by Dan Stoza's avatar Dan Stoza
Browse files

libgui: Split SurfaceTexture tests into more files 

Extract the many different test fixtures and suites in SurfaceTexture_test.cpp
into separate files. No real functional changes, just tweaking headers to keep
things building (and adding a few copyright headers I forgot last time).

Change-Id: Id801bd5d617f0cc61d22508fb9b71b41694bdecf
parent f3730fb8

libs/gui/tests/Android.mk

+8 −1
Original line number Diff line number Diff line
@@ -9,11 +9,18 @@ LOCAL_MODULE_TAGS := tests 
LOCAL_SRC_FILES := \

    BufferQueue_test.cpp \

    CpuConsumer_test.cpp \

    FillBuffer.cpp \

    GLTest.cpp \

    IGraphicBufferProducer_test.cpp \

    MultiTextureConsumer_test.cpp \

    SurfaceTextureClient_test.cpp \

    SurfaceTexture_test.cpp \

    SurfaceTextureFBO_test.cpp \

    SurfaceTextureGLThreadToGL_test.cpp \

    SurfaceTextureGLToGL_test.cpp \

    SurfaceTextureGL_test.cpp \

    SurfaceTextureMultiContextGL_test.cpp \

    Surface_test.cpp \

    TextureRenderer.cpp \



LOCAL_SHARED_LIBRARIES := \

	libEGL \

libs/gui/tests/DisconnectWaiter.h

0 → 100644
+78 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef ANDROID_DISCONNECT_WAITER_H

#define ANDROID_DISCONNECT_WAITER_H



#include <gui/IConsumerListener.h>



#include <utils/Condition.h>

#include <utils/Mutex.h>



namespace android {



// Note that GLConsumer will lose the notifications

// onBuffersReleased and onFrameAvailable as there is currently

// no way to forward the events.  This DisconnectWaiter will not let the

// disconnect finish until finishDisconnect() is called.  It will

// also block until a disconnect is called

class DisconnectWaiter : public BnConsumerListener {

public:

    DisconnectWaiter () :

        mWaitForDisconnect(false),

        mPendingFrames(0) {

    }



    void waitForFrame() {

        Mutex::Autolock lock(mMutex);

        while (mPendingFrames == 0) {

            mFrameCondition.wait(mMutex);

        }

        mPendingFrames--;

    }



    virtual void onFrameAvailable() {

        Mutex::Autolock lock(mMutex);

        mPendingFrames++;

        mFrameCondition.signal();

    }



    virtual void onBuffersReleased() {

        Mutex::Autolock lock(mMutex);

        while (!mWaitForDisconnect) {

            mDisconnectCondition.wait(mMutex);

        }

    }



    void finishDisconnect() {

        Mutex::Autolock lock(mMutex);

        mWaitForDisconnect = true;

        mDisconnectCondition.signal();

    }



private:

    Mutex mMutex;



    bool mWaitForDisconnect;

    Condition mDisconnectCondition;



    int mPendingFrames;

    Condition mFrameCondition;

};



} // namespace android



#endif

libs/gui/tests/FillBuffer.cpp

0 → 100644
+108 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "FillBuffer.h"



#include <ui/GraphicBuffer.h>



#include <gtest/gtest.h>



namespace android {



void fillYV12Buffer(uint8_t* buf, int w, int h, int stride) {

    const int blockWidth = w > 16 ? w / 16 : 1;

    const int blockHeight = h > 16 ? h / 16 : 1;

    const int yuvTexOffsetY = 0;

    int yuvTexStrideY = stride;

    int yuvTexOffsetV = yuvTexStrideY * h;

    int yuvTexStrideV = (yuvTexStrideY/2 + 0xf) & ~0xf;

    int yuvTexOffsetU = yuvTexOffsetV + yuvTexStrideV * h/2;

    int yuvTexStrideU = yuvTexStrideV;

    for (int x = 0; x < w; x++) {

        for (int y = 0; y < h; y++) {

            int parityX = (x / blockWidth) & 1;

            int parityY = (y / blockHeight) & 1;

            unsigned char intensity = (parityX ^ parityY) ? 63 : 191;

            buf[yuvTexOffsetY + (y * yuvTexStrideY) + x] = intensity;

            if (x < w / 2 && y < h / 2) {

                buf[yuvTexOffsetU + (y * yuvTexStrideU) + x] = intensity;

                if (x * 2 < w / 2 && y * 2 < h / 2) {

                    buf[yuvTexOffsetV + (y*2 * yuvTexStrideV) + x*2 + 0] =

                    buf[yuvTexOffsetV + (y*2 * yuvTexStrideV) + x*2 + 1] =

                    buf[yuvTexOffsetV + ((y*2+1) * yuvTexStrideV) + x*2 + 0] =

                    buf[yuvTexOffsetV + ((y*2+1) * yuvTexStrideV) + x*2 + 1] =

                        intensity;

                }

            }

        }

    }

}



void fillYV12BufferRect(uint8_t* buf, int w, int h, int stride,

        const android_native_rect_t& rect) {

    const int yuvTexOffsetY = 0;

    int yuvTexStrideY = stride;

    int yuvTexOffsetV = yuvTexStrideY * h;

    int yuvTexStrideV = (yuvTexStrideY/2 + 0xf) & ~0xf;

    int yuvTexOffsetU = yuvTexOffsetV + yuvTexStrideV * h/2;

    int yuvTexStrideU = yuvTexStrideV;

    for (int x = 0; x < w; x++) {

        for (int y = 0; y < h; y++) {

            bool inside = rect.left <= x && x < rect.right &&

                    rect.top <= y && y < rect.bottom;

            buf[yuvTexOffsetY + (y * yuvTexStrideY) + x] = inside ? 240 : 64;

            if (x < w / 2 && y < h / 2) {

                bool inside = rect.left <= 2*x && 2*x < rect.right &&

                        rect.top <= 2*y && 2*y < rect.bottom;

                buf[yuvTexOffsetU + (y * yuvTexStrideU) + x] = 16;

                buf[yuvTexOffsetV + (y * yuvTexStrideV) + x] =

                        inside ? 16 : 255;

            }

        }

    }

}



void fillRGBA8Buffer(uint8_t* buf, int w, int h, int stride) {

    const size_t PIXEL_SIZE = 4;

    for (int x = 0; x < w; x++) {

        for (int y = 0; y < h; y++) {

            off_t offset = (y * stride + x) * PIXEL_SIZE;

            for (int c = 0; c < 4; c++) {

                int parityX = (x / (1 << (c+2))) & 1;

                int parityY = (y / (1 << (c+2))) & 1;

                buf[offset + c] = (parityX ^ parityY) ? 231 : 35;

            }

        }

    }

}



void produceOneRGBA8Frame(const sp<ANativeWindow>& anw) {

    android_native_buffer_t* anb;

    ASSERT_EQ(NO_ERROR, native_window_dequeue_buffer_and_wait(anw.get(),

            &anb));

    ASSERT_TRUE(anb != NULL);



    sp<GraphicBuffer> buf(new GraphicBuffer(anb, false));



    uint8_t* img = NULL;

    ASSERT_EQ(NO_ERROR, buf->lock(GRALLOC_USAGE_SW_WRITE_OFTEN,

            (void**)(&img)));

    fillRGBA8Buffer(img, buf->getWidth(), buf->getHeight(), buf->getStride());

    ASSERT_EQ(NO_ERROR, buf->unlock());

    ASSERT_EQ(NO_ERROR, anw->queueBuffer(anw.get(), buf->getNativeBuffer(),

            -1));

}

} // namespace android

libs/gui/tests/FillBuffer.h

0 → 100644
+43 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef ANDROID_FILL_BUFFER_H

#define ANDROID_FILL_BUFFER_H



#include <system/window.h>

#include <utils/StrongPointer.h>



namespace android {



// Fill a YV12 buffer with a multi-colored checkerboard pattern

void fillYV12Buffer(uint8_t* buf, int w, int h, int stride);



// Fill a YV12 buffer with red outside a given rectangle and green inside it.

void fillYV12BufferRect(uint8_t* buf, int w, int h, int stride,

        const android_native_rect_t& rect);



void fillRGBA8Buffer(uint8_t* buf, int w, int h, int stride);



// Produce a single RGBA8 frame by filling a buffer with a checkerboard pattern

// using the CPU.  This assumes that the ANativeWindow is already configured to

// allow this to be done (e.g. the format is set to RGBA8).

//

// Calls to this function should be wrapped in an ASSERT_NO_FATAL_FAILURE().

void produceOneRGBA8Frame(const sp<ANativeWindow>& anw);



} // namespace android



#endif

libs/gui/tests/FrameWaiter.h

0 → 100644
+52 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef ANDROID_FRAME_WAITER_H

#define ANDROID_FRAME_WAITER_H



#include <gui/GLConsumer.h>



namespace android {



class FrameWaiter : public GLConsumer::FrameAvailableListener {

public:

    FrameWaiter():

            mPendingFrames(0) {

    }



    void waitForFrame() {

        Mutex::Autolock lock(mMutex);

        while (mPendingFrames == 0) {

            mCondition.wait(mMutex);

        }

        mPendingFrames--;

    }



    virtual void onFrameAvailable() {

        Mutex::Autolock lock(mMutex);

        mPendingFrames++;

        mCondition.signal();

    }



private:

    int mPendingFrames;

    Mutex mMutex;

    Condition mCondition;

};



} // namespace android



#endif