diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2012-04-19 12:36:39 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2012-04-19 12:36:39 +0800 |
| commit | 10f24e506f508599396f31b8d58f70ac5555f354 (patch) | |
| tree | 82ed44df22b72d97fb6942db5c1e8a68853d4edc | |
| parent | d3ed7e4851d939d3952be692930bfd13556b26ac (diff) | |
| download | hardware_ti_omap4xxx-10f24e506f508599396f31b8d58f70ac5555f354.zip hardware_ti_omap4xxx-10f24e506f508599396f31b8d58f70ac5555f354.tar.gz hardware_ti_omap4xxx-10f24e506f508599396f31b8d58f70ac5555f354.tar.bz2 | |
Revert "Use new camera connect api."
This reverts commit ab9ef43721796d6ee4b35ab4614be0210a189fe4.
| -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 eb78f0f..1430ea4 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, false, false); + camera = Camera::connect(camera_index); if ( NULL == camera.get() ) { printf("Unable to connect to CameraService\n"); printf("Retrying... \n"); sleep(1); - camera = Camera::connect(camera_index, false, false); + camera = Camera::connect(camera_index); if ( NULL == camera.get() ) { printf("Giving up!! \n"); @@ -1456,10 +1456,10 @@ int functional_menu() { stopRecording(); closeRecorder(); - camera = Camera::connect(camera_index, false, false); + camera = Camera::connect(camera_index); if ( NULL == camera.get() ) { sleep(1); - camera = Camera::connect(camera_index, false, false); + camera = Camera::connect(camera_index); if ( NULL == camera.get() ) { return -1; } diff --git a/test/CameraHal/camera_test_script.cpp b/test/CameraHal/camera_test_script.cpp index d8c2fb1..afd88be 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, false, false); + camera = Camera::connect(camera_index); if ( NULL == camera.get() ) { sleep(1); - camera = Camera::connect(camera_index, false, false); + camera = Camera::connect(camera_index); if ( NULL == camera.get() ) { return -1; |