summaryrefslogtreecommitdiffstats
path: root/services/camera
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-10-23 09:09:01 -0700
committerEino-Ville Talvala <etalvala@google.com>2012-10-23 09:14:48 -0700
commit43b7ac6bd1a949ecb8ffc7e50d0a2f01a6258034 (patch)
tree24c4646428a27aa1645f2439b059b8f685599de5 /services/camera
parentc3ed4a1c3ea71681c71de48c206a899e702864bd (diff)
downloadframeworks_av-43b7ac6bd1a949ecb8ffc7e50d0a2f01a6258034.zip
frameworks_av-43b7ac6bd1a949ecb8ffc7e50d0a2f01a6258034.tar.gz
frameworks_av-43b7ac6bd1a949ecb8ffc7e50d0a2f01a6258034.tar.bz2
Camera2: Increase mode update timeout.
During camera startup, it might take a few hundred milliseconds before requests start to be dequeued by the HAL. Increase the timeout for synchronizing mode changes and triggers so that triggers near startup don't time out. Bug: 6970465 Change-Id: I9dc35378e8018ec18ae31be874fcb094f8a9a0e9
Diffstat (limited to 'services/camera')
-rw-r--r--services/camera/libcameraservice/Camera2Client.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp
index 0675400..94630f9 100644
--- a/services/camera/libcameraservice/Camera2Client.cpp
+++ b/services/camera/libcameraservice/Camera2Client.cpp
@@ -1614,7 +1614,7 @@ size_t Camera2Client::calculateBufferSize(int width, int height,
status_t Camera2Client::syncWithDevice() {
ATRACE_CALL();
- const nsecs_t kMaxSyncTimeout = 100000000; // 100 ms
+ const nsecs_t kMaxSyncTimeout = 500000000; // 500 ms
status_t res;
int32_t activeRequestId = mStreamingProcessor->getActiveRequestId();