diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-09-18 17:58:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-18 17:58:26 -0700 |
| commit | d5a9ae029b50678de3b468d8324728a73ff5b0aa (patch) | |
| tree | 08c354ef92537e01b74b2abe66f65ee0da9d03cb /services/camera/libcameraservice | |
| parent | a2acc96eadc02228b8a3366de3d05d3a6a81272c (diff) | |
| parent | 59ab044774bf7fd0b841087212078babb4451eb8 (diff) | |
| download | frameworks_av-d5a9ae029b50678de3b468d8324728a73ff5b0aa.zip frameworks_av-d5a9ae029b50678de3b468d8324728a73ff5b0aa.tar.gz frameworks_av-d5a9ae029b50678de3b468d8324728a73ff5b0aa.tar.bz2 | |
Merge "Camera2: Increase capture timeout." into jb-mr1-dev
Diffstat (limited to 'services/camera/libcameraservice')
| -rw-r--r-- | services/camera/libcameraservice/camera2/CaptureSequencer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/camera2/CaptureSequencer.h b/services/camera/libcameraservice/camera2/CaptureSequencer.h index 39ae079..c5c5654 100644 --- a/services/camera/libcameraservice/camera2/CaptureSequencer.h +++ b/services/camera/libcameraservice/camera2/CaptureSequencer.h @@ -93,7 +93,7 @@ class CaptureSequencer: static const nsecs_t kWaitDuration = 100000000; // 100 ms static const int kMaxTimeoutsForPrecaptureStart = 2; // 200 ms static const int kMaxTimeoutsForPrecaptureEnd = 10; // 1 sec - static const int kMaxTimeoutsForCaptureEnd = 20; // 2 sec + static const int kMaxTimeoutsForCaptureEnd = 40; // 4 sec wp<Camera2Client> mClient; wp<ZslProcessor> mZslProcessor; |