commit 8ef0144a52df7edfb754efce597e078bc185c57d
author Zhijun He <zhijunhe@google.com> Tue Aug 13 17:36:17 2013 -0700
committer Zhijun He <zhijunhe@google.com> Mon Aug 19 12:43:19 2013 -0700
tree 30a69f82d12626cd4d0c59e6b26fa3932ef8166a
parent 299e43c186a9c8a6611d8c5f61d158436948afe5

Camera2 Tests: Add multiple stream tests

Add a test to test multiple stream configuration: one preview stream, one small
size YUV burst capture stream, and one large size YUV burst capture stream.

Also cleanup the code.

Bug 10325342

Change-Id: I676484cc0034055caa8f2a8788100ed34b4cefbb

tests/camera2/camera2.cpp

diff --git a/tests/camera2/camera2.cpp b/tests/camera2/camera2.cpp
index 17e4792..600d440 100644
--- a/tests/camera2/camera2.cpp
+++ b/tests/camera2/camera2.cpp
@@ -201,7 +201,8 @@
         if (mDevice != NULL) {
             closeCameraDevice(&mDevice);
         }
-        mDevice = openCameraDevice(id);
+        mId = id;
+        mDevice = openCameraDevice(mId);
         ASSERT_TRUE(NULL != mDevice) << "Failed to open camera device";
 
         camera_info info;
@@ -334,6 +335,7 @@
         TearDownModule();
     }
 
+    int mId;
     camera2_device    *mDevice;
     const camera_metadata_t *mStaticInfo;