diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-09-09 18:28:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-09 18:28:12 +0000 |
| commit | eb485256e99e97653773024951568aadcc60f6a4 (patch) | |
| tree | 0eafb90e8c94c5a91ca42d249e6ccc40ca630b09 | |
| parent | 51dbad3bfa313a4ba9219e3d9c4b3c1b2a15d52f (diff) | |
| parent | a1594173890ffc8aa45293c1ac3e11ea90fe6f57 (diff) | |
| download | libhardware-eb485256e99e97653773024951568aadcc60f6a4.tar.gz | |
Merge "Camera2 Tests: Fix stream id types" into klp-dev
| -rw-r--r-- | tests/camera2/CameraBurstTests.cpp | 4 | ||||
| -rw-r--r-- | tests/camera2/CameraFrameTests.cpp | 2 | ||||
| -rw-r--r-- | tests/camera2/CameraMultiStreamTests.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/camera2/CameraBurstTests.cpp b/tests/camera2/CameraBurstTests.cpp index 5ad638a3..67b29abc 100644 --- a/tests/camera2/CameraBurstTests.cpp +++ b/tests/camera2/CameraBurstTests.cpp @@ -183,7 +183,7 @@ TEST_F(CameraBurstTest, ManualExposureControl) { ASSERT_EQ(OK, mDevice->createDefaultRequest(CAMERA2_TEMPLATE_PREVIEW, &previewRequest)); { - Vector<uint8_t> outputStreamIds; + Vector<int32_t> outputStreamIds; outputStreamIds.push(mStreamId); ASSERT_EQ(OK, previewRequest.update(ANDROID_REQUEST_OUTPUT_STREAMS, outputStreamIds)); @@ -558,7 +558,7 @@ TEST_F(CameraBurstTest, VariableBurst) { ASSERT_EQ(OK, mDevice->createDefaultRequest(CAMERA2_TEMPLATE_PREVIEW, &previewRequest)); { - Vector<uint8_t> outputStreamIds; + Vector<int32_t> outputStreamIds; outputStreamIds.push(mStreamId); ASSERT_EQ(OK, previewRequest.update(ANDROID_REQUEST_OUTPUT_STREAMS, outputStreamIds)); diff --git a/tests/camera2/CameraFrameTests.cpp b/tests/camera2/CameraFrameTests.cpp index eb29c68e..e78a862c 100644 --- a/tests/camera2/CameraFrameTests.cpp +++ b/tests/camera2/CameraFrameTests.cpp @@ -90,7 +90,7 @@ TEST_P(CameraFrameTest, GetFrame) { ASSERT_EQ(OK, mDevice->createDefaultRequest(CAMERA2_TEMPLATE_PREVIEW, &previewRequest)); { - Vector<uint8_t> outputStreamIds; + Vector<int32_t> outputStreamIds; outputStreamIds.push(mStreamId); ASSERT_EQ(OK, previewRequest.update(ANDROID_REQUEST_OUTPUT_STREAMS, outputStreamIds)); diff --git a/tests/camera2/CameraMultiStreamTests.cpp b/tests/camera2/CameraMultiStreamTests.cpp index 679ff4e1..f2044f5f 100644 --- a/tests/camera2/CameraMultiStreamTests.cpp +++ b/tests/camera2/CameraMultiStreamTests.cpp @@ -270,7 +270,7 @@ public: int meteringStreamId, int captureStreamId) { int32_t requestId = 1; - Vector<uint8_t> previewStreamIds; + Vector<int32_t> previewStreamIds; previewStreamIds.push(previewStreamId); ASSERT_EQ(OK, mDevice->createDefaultRequest(CAMERA2_TEMPLATE_PREVIEW, &previewRequest)); @@ -284,7 +284,7 @@ public: uint8_t cmOff = static_cast<uint8_t>(ANDROID_CONTROL_MODE_OFF); uint8_t nrOff = static_cast<uint8_t>(ANDROID_NOISE_REDUCTION_MODE_OFF); uint8_t sharpOff = static_cast<uint8_t>(ANDROID_EDGE_MODE_OFF); - Vector<uint8_t> meteringStreamIds; + Vector<int32_t> meteringStreamIds; meteringStreamIds.push(meteringStreamId); ASSERT_EQ(OK, mDevice->createDefaultRequest( CAMERA2_TEMPLATE_PREVIEW, @@ -307,7 +307,7 @@ public: // Create capture request, manual settings requestId++; - Vector<uint8_t> captureStreamIds; + Vector<int32_t> captureStreamIds; captureStreamIds.push(captureStreamId); ASSERT_EQ(OK, mDevice->createDefaultRequest( CAMERA2_TEMPLATE_PREVIEW, |