diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-08-11 17:33:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-11 17:09:03 +0000 |
| commit | 9605e80e18c5361d867d70b6c4ee8efd22dee058 (patch) | |
| tree | 2eb240ba5e8b5cb25a7b5837981ccbd62677a64b | |
| parent | 8af5daea5026991137042a263a520b4c79aa3838 (diff) | |
| parent | 1c3e65731a8582d4da24e0ca4e136c372aec9e94 (diff) | |
| download | libhardware-9605e80e18c5361d867d70b6c4ee8efd22dee058.tar.gz | |
Merge "Camera2/3 HAL test: Update tet according createStream change" into lmp-dev
| -rw-r--r-- | tests/camera2/CameraMultiStreamTests.cpp | 2 | ||||
| -rw-r--r-- | tests/camera2/CameraStreamFixture.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/camera2/CameraMultiStreamTests.cpp b/tests/camera2/CameraMultiStreamTests.cpp index 066f4ee2..27424661 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, /*size (for jpegs)*/0, + mWidth, mHeight, mFormat, &mStreamId)); ASSERT_NE(-1, mStreamId); diff --git a/tests/camera2/CameraStreamFixture.h b/tests/camera2/CameraStreamFixture.h index 12b19718..f56daf0b 100644 --- a/tests/camera2/CameraStreamFixture.h +++ b/tests/camera2/CameraStreamFixture.h @@ -173,7 +173,7 @@ protected: ASSERT_EQ(OK, device->createStream(mNativeWindow, - mWidth, mHeight, format, /*size (for jpegs)*/0, + mWidth, mHeight, format, &mStreamId)); ASSERT_NE(-1, mStreamId); |