commit ea39eba30120e09c1174805b28f83a4247817ab0
author Mansoor Aftab <maftab@codeaurora.org> Thu Jan 26 14:58:25 2017 -0800
committer Zhijun He <zhijunhe@google.com> Mon Jan 30 14:23:44 2017 -0800
tree 3b1df6860195b57b461a4f8c77e7edb0c2cc3cb9
parent 58465fae776ed65c8b9e984089cbfe8d3beafa5f

Changes to support video hdr via setprop

adb shell setprop persist.camera.hdr.video 1
adb shell setprop persist.camera.sensor.hdr 2 (for zzhdr)

Change-Id: I70651835a0e3bee0f8b13a1dff68163f0cbf22d8

msm8998/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
index e145f8a..e524d76 100644
--- a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
@@ -9784,6 +9784,12 @@
     bool fastModeEntryAvailable = FALSE;
     vsMode = ANDROID_CONTROL_VIDEO_STABILIZATION_MODE_OFF;
     optStabMode = ANDROID_LENS_OPTICAL_STABILIZATION_MODE_OFF;
+
+    char videoHdrProp[PROPERTY_VALUE_MAX];
+    memset(videoHdrProp, 0, sizeof(videoHdrProp));
+    property_get("persist.camera.hdr.video", videoHdrProp, "0");
+    uint8_t hdr_mode = (uint8_t)atoi(videoHdrProp);
+
     switch (type) {
       case CAMERA3_TEMPLATE_PREVIEW:
         controlIntent = ANDROID_CONTROL_CAPTURE_INTENT_PREVIEW;
@@ -9828,6 +9834,7 @@
         tonemap_mode = ANDROID_TONEMAP_MODE_FAST;
         if (forceVideoOis)
             optStabMode = ANDROID_LENS_OPTICAL_STABILIZATION_MODE_ON;
+        settings.update(QCAMERA3_VIDEO_HDR_MODE, &hdr_mode, 1);
         break;
       case CAMERA3_TEMPLATE_VIDEO_SNAPSHOT:
         controlIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT;
@@ -9839,6 +9846,7 @@
         tonemap_mode = ANDROID_TONEMAP_MODE_FAST;
         if (forceVideoOis)
             optStabMode = ANDROID_LENS_OPTICAL_STABILIZATION_MODE_ON;
+        settings.update(QCAMERA3_VIDEO_HDR_MODE, &hdr_mode, 1);
         break;
       case CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG:
         controlIntent = ANDROID_CONTROL_CAPTURE_INTENT_ZERO_SHUTTER_LAG;