Merge "Increase frame timeouts to allow for longer exposures" into oc-dr1-dev
diff --git a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
index 1c2d84f..58d5078 100644
--- a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
@@ -98,7 +98,7 @@
#define REGIONS_TUPLE_COUNT 5
#define HDR_PLUS_PERF_TIME_OUT (7000) // milliseconds
// Set a threshold for detection of missing buffers //seconds
-#define MISSING_REQUEST_BUF_TIMEOUT 3
+#define MISSING_REQUEST_BUF_TIMEOUT 10
#define MISSING_HDRPLUS_REQUEST_BUF_TIMEOUT 30
#define FLUSH_TIMEOUT 3
#define METADATA_MAP_SIZE(MAP) (sizeof(MAP)/sizeof(MAP[0]))
diff --git a/msm8998/QCamera2/stack/mm-camera-interface/inc/mm_camera.h b/msm8998/QCamera2/stack/mm-camera-interface/inc/mm_camera.h
index e3e2570..765b1b1 100644
--- a/msm8998/QCamera2/stack/mm-camera-interface/inc/mm_camera.h
+++ b/msm8998/QCamera2/stack/mm-camera-interface/inc/mm_camera.h
@@ -57,7 +57,7 @@
/* Future frame idx, large enough to make sure capture
* settings can be applied and small enough to still capture an image */
#define MM_CAMERA_MAX_FUTURE_FRAME_WAIT 100
-#define WAIT_TIMEOUT 5
+#define WAIT_TIMEOUT 10
/*For frame sync */
#define MAX_OBJS_FOR_FRAME_SYNC 4