Merge "libgui: add BufferQueue test infrastructure" into jb-mr1-dev (e84ec393) · Commits · e / os / platform_frameworks_native

include/gui/ISurfaceTexture.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -39,9 +39,6 @@ class ISurfaceTexture : public IInterface
		public:
		DECLARE_META_INTERFACE(SurfaceTexture);

		protected:
		friend class SurfaceTextureClient;

		enum {
		BUFFER_NEEDS_REALLOCATION = 0x1,
		RELEASE_ALL_BUFFERS = 0x2,

libs/gui/tests/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@ LOCAL_MODULE := libgui_test
		LOCAL_MODULE_TAGS := tests

		LOCAL_SRC_FILES := \
		BufferQueue_test.cpp \
		CpuConsumer_test.cpp \
		SurfaceTextureClient_test.cpp \
		SurfaceTexture_test.cpp \

libs/gui/tests/BufferQueue_test.cpp

0 → 100644

+96 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 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.
		*/

		#define LOG_TAG "BufferQueue_test"
		//#define LOG_NDEBUG 0

		#include <gtest/gtest.h>

		#include <utils/String8.h>
		#include <utils/threads.h>

		#include <ui/GraphicBuffer.h>
		#include <ui/FramebufferNativeWindow.h>

		#include <gui/BufferQueue.h>

		namespace android {

		class BufferQueueTest : public ::testing::Test {
		protected:

		BufferQueueTest() {}

		virtual void SetUp() {
		const ::testing::TestInfo* const testInfo =
		::testing::UnitTest::GetInstance()->current_test_info();
		ALOGV("Begin test: %s.%s", testInfo->test_case_name(),
		testInfo->name());

		mBQ = new BufferQueue();
		}

		virtual void TearDown() {
		mBQ.clear();

		const ::testing::TestInfo* const testInfo =
		::testing::UnitTest::GetInstance()->current_test_info();
		ALOGV("End test: %s.%s", testInfo->test_case_name(),
		testInfo->name());
		}

		sp<BufferQueue> mBQ;
		};

		struct DummyConsumer : public BufferQueue::ConsumerListener {
		virtual void onFrameAvailable() {}
		virtual void onBuffersReleased() {}
		};

		TEST_F(BufferQueueTest, AcquireBuffer_ExceedsMaxAcquireCount_Fails) {
		sp<DummyConsumer> dc(new DummyConsumer);
		mBQ->consumerConnect(dc);
		ISurfaceTexture::QueueBufferOutput qbo;
		mBQ->connect(NATIVE_WINDOW_API_CPU, &qbo);
		mBQ->setBufferCount(4);

		int slot;
		sp<Fence> fence;
		sp<GraphicBuffer> buf;
		ISurfaceTexture::QueueBufferInput qbi(0, Rect(0, 0, 1, 1),
		NATIVE_WINDOW_SCALING_MODE_FREEZE, 0, fence);
		BufferQueue::BufferItem item;

		for (int i = 0; i < 2; i++) {
		ASSERT_EQ(ISurfaceTexture::BUFFER_NEEDS_REALLOCATION,
		mBQ->dequeueBuffer(&slot, fence, 1, 1, 0,
		GRALLOC_USAGE_SW_READ_OFTEN));
		ASSERT_EQ(OK, mBQ->requestBuffer(slot, &buf));
		ASSERT_EQ(OK, mBQ->queueBuffer(slot, qbi, &qbo));
		ASSERT_EQ(OK, mBQ->acquireBuffer(&item));
		}

		ASSERT_EQ(ISurfaceTexture::BUFFER_NEEDS_REALLOCATION,
		mBQ->dequeueBuffer(&slot, fence, 1, 1, 0,
		GRALLOC_USAGE_SW_READ_OFTEN));
		ASSERT_EQ(OK, mBQ->requestBuffer(slot, &buf));
		ASSERT_EQ(OK, mBQ->queueBuffer(slot, qbi, &qbo));

		// Acquire the third buffer, which should fail.
		ASSERT_EQ(INVALID_OPERATION, mBQ->acquireBuffer(&item));
		}

		} // namespace android