diff options
author | Wu-cheng Li <wuchengli@google.com> | 2012-03-06 23:21:41 +0800 |
---|---|---|
committer | Wu-cheng Li <wuchengli@google.com> | 2012-03-13 18:20:15 +0800 |
commit | ab9ef43721796d6ee4b35ab4614be0210a189fe4 (patch) | |
tree | 6224b80525a6a1f87e6f396f11cb193ff1d0dea3 /test/CameraHal | |
parent | 0bd1733fe9cb887ce6d35bf7da99debd45401509 (diff) | |
download | android_hardware_ti_omap4xxx-ab9ef43721796d6ee4b35ab4614be0210a189fe4.tar.gz android_hardware_ti_omap4xxx-ab9ef43721796d6ee4b35ab4614be0210a189fe4.tar.bz2 android_hardware_ti_omap4xxx-ab9ef43721796d6ee4b35ab4614be0210a189fe4.zip |
Use new camera connect api.
bug:5584464
Change-Id: I7d772ac8bedcf9d0ddcff2466132c91e45c8f0fc
Diffstat (limited to 'test/CameraHal')
-rw-r--r-- | test/CameraHal/camera_test_menu.cpp | 8 | ||||
-rw-r--r-- | test/CameraHal/camera_test_script.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/CameraHal/camera_test_menu.cpp b/test/CameraHal/camera_test_menu.cpp index 1430ea4..eb78f0f 100644 --- a/test/CameraHal/camera_test_menu.cpp +++ b/test/CameraHal/camera_test_menu.cpp @@ -1013,13 +1013,13 @@ int stopRecording() { int openCamera() { printf("openCamera(camera_index=%d)\n", camera_index); - camera = Camera::connect(camera_index); + camera = Camera::connect(camera_index, false, false); if ( NULL == camera.get() ) { printf("Unable to connect to CameraService\n"); printf("Retrying... \n"); sleep(1); - camera = Camera::connect(camera_index); + camera = Camera::connect(camera_index, false, false); if ( NULL == camera.get() ) { printf("Giving up!! \n"); @@ -1456,10 +1456,10 @@ int functional_menu() { stopRecording(); closeRecorder(); - camera = Camera::connect(camera_index); + camera = Camera::connect(camera_index, false, false); if ( NULL == camera.get() ) { sleep(1); - camera = Camera::connect(camera_index); + camera = Camera::connect(camera_index, false, false); if ( NULL == camera.get() ) { return -1; } diff --git a/test/CameraHal/camera_test_script.cpp b/test/CameraHal/camera_test_script.cpp index afd88be..d8c2fb1 100644 --- a/test/CameraHal/camera_test_script.cpp +++ b/test/CameraHal/camera_test_script.cpp @@ -237,10 +237,10 @@ int execute_functional_script(char *script) { stopRecording(); closeRecorder(); - camera = Camera::connect(camera_index); + camera = Camera::connect(camera_index, false, false); if ( NULL == camera.get() ) { sleep(1); - camera = Camera::connect(camera_index); + camera = Camera::connect(camera_index, false, false); if ( NULL == camera.get() ) { return -1; |