diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-03-21 20:58:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-21 20:58:30 +0000 |
| commit | 7481a2d0f802f9ca9eb9298b0d18c7dc41978693 (patch) | |
| tree | 41d8bd4aab538364afcd802735c079757595ce99 | |
| parent | dbb02997ff42329c6ab7562318b54be957e33f65 (diff) | |
| parent | 5fdb73375a8841f2ecbca593850a6cc17798674a (diff) | |
| download | camera-7481a2d0f802f9ca9eb9298b0d18c7dc41978693.tar.gz | |
Merge "QCamera2: HAL3: Add new capture intent definition" into pi-dev
| -rw-r--r-- | msm8998/QCamera2/HAL3/QCamera3HWI.cpp | 4 | ||||
| -rw-r--r-- | msm8998/QCamera2/stack/common/cam_types.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp index 4c5322f..3f46bf3 100644 --- a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp +++ b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp @@ -13567,6 +13567,10 @@ int QCamera3HardwareInterface::translateFwkMetadataToHalMetadata( if (frame_settings.exists(NEXUS_EXPERIMENTAL_2016_HYBRID_AE_ENABLE)) { uint8_t *hybrid_ae = (uint8_t *) frame_settings.find(NEXUS_EXPERIMENTAL_2016_HYBRID_AE_ENABLE).data.u8; + // Motion tracking intent isn't compatible with hybrid ae. + if (mCaptureIntent == CAM_INTENT_MOTION_TRACKING) { + *hybrid_ae = 0; + } if (ADD_SET_PARAM_ENTRY_TO_BATCH(hal_metadata, CAM_INTF_META_HYBRID_AE, *hybrid_ae)) { rc = BAD_VALUE; } diff --git a/msm8998/QCamera2/stack/common/cam_types.h b/msm8998/QCamera2/stack/common/cam_types.h index 57c8ed4..ecdf509 100644 --- a/msm8998/QCamera2/stack/common/cam_types.h +++ b/msm8998/QCamera2/stack/common/cam_types.h @@ -2634,6 +2634,8 @@ typedef enum { CAM_INTENT_VIDEO_RECORD, CAM_INTENT_VIDEO_SNAPSHOT, CAM_INTENT_ZERO_SHUTTER_LAG, + CAM_INTENT_MANUAL, + CAM_INTENT_MOTION_TRACKING, CAM_INTENT_MAX, } cam_intent_t; |