Merge "camera: Change HDR+ shot hint to 2s" into oc-dr1-dev
diff --git a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
index ed9bf0f..d4060de 100644
--- a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
@@ -95,7 +95,6 @@
#define TEMPLATE_MAX_PREVIEW_FPS (30.0)
#define MAX_HFR_BATCH_SIZE (8)
#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 10
#define MISSING_HDRPLUS_REQUEST_BUF_TIMEOUT 30
@@ -4024,7 +4023,8 @@
return;
}
- //acquire perf lock for 5 sec after the last HDR frame is captured
+ //acquire perf lock for 2 secs after the last HDR frame is captured
+ constexpr uint32_t HDR_PLUS_PERF_TIME_OUT = 2000;
if ((p_frame_number_valid != NULL) && *p_frame_number_valid) {
if ((p_frame_number != NULL) &&
(mLastCustIntentFrmNum == (int32_t)*p_frame_number)) {