commit a1594173890ffc8aa45293c1ac3e11ea90fe6f57
author Zhijun He <zhijunhe@google.com> Fri Sep 06 15:35:09 2013 -0700
committer Zhijun He <zhijunhe@google.com> Fri Sep 06 15:35:09 2013 -0700
tree e50ad53f444779d25a796a3be61d598475e216b7
parent c124b23f94a0a88e872253720c0e27594a9a9938

Camera2 Tests: Fix stream id types

Bug: 10604704
Change-Id: I5edddb1011d6744225c59f44bd6df8ae4234d336

tests/camera2/CameraBurstTests.cpp

diff --git a/tests/camera2/CameraBurstTests.cpp b/tests/camera2/CameraBurstTests.cpp
index 5ad638a..67b29ab 100644
--- a/tests/camera2/CameraBurstTests.cpp
+++ b/tests/camera2/CameraBurstTests.cpp
@@ -183,7 +183,7 @@
     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 @@
     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));

tests/camera2/CameraFrameTests.cpp

diff --git a/tests/camera2/CameraFrameTests.cpp b/tests/camera2/CameraFrameTests.cpp
index eb29c68..e78a862 100644
--- a/tests/camera2/CameraFrameTests.cpp
+++ b/tests/camera2/CameraFrameTests.cpp
@@ -90,7 +90,7 @@
     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));

tests/camera2/CameraMultiStreamTests.cpp

diff --git a/tests/camera2/CameraMultiStreamTests.cpp b/tests/camera2/CameraMultiStreamTests.cpp
index 679ff4e..f2044f5 100644
--- a/tests/camera2/CameraMultiStreamTests.cpp
+++ b/tests/camera2/CameraMultiStreamTests.cpp
@@ -270,7 +270,7 @@
             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 @@
     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 @@
 
     // 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,