From 898ad176cd9f017629c3fdd6c50ed4afb56cbfc1 Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Fri, 6 Mar 2015 13:23:18 -0800 Subject: Camera tests: Adjust for framework device interface changes Account for requirement to pass in dataspace in stream creation. Change-Id: Ibc5af912ef4a55b787c70843fc82422977a02c0b --- tests/camera2/CameraMultiStreamTests.cpp | 2 +- tests/camera2/CameraStreamFixture.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/camera2/CameraMultiStreamTests.cpp b/tests/camera2/CameraMultiStreamTests.cpp index df8e623..1edc28e 100644 --- a/tests/camera2/CameraMultiStreamTests.cpp +++ b/tests/camera2/CameraMultiStreamTests.cpp @@ -208,7 +208,7 @@ public: void SetUp() { ASSERT_EQ(OK, mDevice->createStream(mNativeWindow, - mWidth, mHeight, mFormat, + mWidth, mHeight, mFormat, HAL_DATASPACE_UNKNOWN, &mStreamId)); ASSERT_NE(-1, mStreamId); diff --git a/tests/camera2/CameraStreamFixture.h b/tests/camera2/CameraStreamFixture.h index cc13169..ff110d8 100644 --- a/tests/camera2/CameraStreamFixture.h +++ b/tests/camera2/CameraStreamFixture.h @@ -257,6 +257,7 @@ protected: ASSERT_EQ(OK, device->createStream(mNativeWindow, mWidth, mHeight, format, + HAL_DATASPACE_UNKNOWN, &mStreamId)); ASSERT_NE(-1, mStreamId); -- cgit v1.1