summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShuzhen Wang <shuzhenwang@google.com>2017-10-12 22:27:24 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-12 22:27:24 +0000
commitfa93e57e4e0a204872c4ea91958f51dfda04c7ac (patch)
treee059d36d6dd94510556259197bd3b1f25f8b7997
parentcf427272170a43ef16e9bdf09c11b2eb4d1bc329 (diff)
parent28515ec9dc169e1ebbcc9eafdd4e8041c96ac36c (diff)
downloadangler-fa93e57e4e0a204872c4ea91958f51dfda04c7ac.tar.gz
QCamera2: stack: Increase camera open retry count
am: 28515ec9dc Change-Id: I0ce88e1aef7210d11e69693f4a4cb53df92a8a93
-rw-r--r--camera/QCamera2/stack/mm-camera-interface/inc/mm_camera.h2
-rw-r--r--camera/QCamera2/stack/mm-camera-interface/src/mm_camera.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/camera/QCamera2/stack/mm-camera-interface/inc/mm_camera.h b/camera/QCamera2/stack/mm-camera-interface/inc/mm_camera.h
index 57154e3..c32e1ce 100644
--- a/camera/QCamera2/stack/mm-camera-interface/inc/mm_camera.h
+++ b/camera/QCamera2/stack/mm-camera-interface/inc/mm_camera.h
@@ -47,7 +47,7 @@
#define MM_CAMERA_CHANNEL_POLL_THREAD_MAX 1
#define MM_CAMERA_DEV_NAME_LEN 32
-#define MM_CAMERA_DEV_OPEN_TRIES 30
+#define MM_CAMERA_DEV_OPEN_TRIES 300
#define MM_CAMERA_DEV_OPEN_RETRY_SLEEP 20
#define THREAD_NAME_SIZE 15
diff --git a/camera/QCamera2/stack/mm-camera-interface/src/mm_camera.c b/camera/QCamera2/stack/mm-camera-interface/src/mm_camera.c
index 9e6f30f..df2d93c 100644
--- a/camera/QCamera2/stack/mm-camera-interface/src/mm_camera.c
+++ b/camera/QCamera2/stack/mm-camera-interface/src/mm_camera.c
@@ -250,7 +250,7 @@ int32_t mm_camera_open(mm_camera_obj_t *my_obj)
{
char dev_name[MM_CAMERA_DEV_NAME_LEN];
int32_t rc = 0;
- int8_t n_try=MM_CAMERA_DEV_OPEN_TRIES;
+ int32_t n_try=MM_CAMERA_DEV_OPEN_TRIES;
uint8_t sleep_msec=MM_CAMERA_DEV_OPEN_RETRY_SLEEP;
int cam_idx = 0;
const char *dev_name_value = NULL;