commit a557c4cefba53893737e9d5530fff8ac7d265e44
author Zhijun He <zhijunhe@google.com> Thu Mar 16 18:37:53 2017 -0700
committer Zhijun He <zhijunhe@google.com> Fri Mar 17 16:57:55 2017 +0000
tree e490855a01fc7798f095c1494095b783e20d62f6
parent 0a972ef2f18fce9ce6cafde5a2452f3752b7cd57

QCamera2: add Easel info

Bug: 33624829
Change-Id: Idd3015a58192b1a70fb1ce5453cc1f22ef7f4376

msm8998/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
index ee98321..3b28f8a 100644
--- a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
@@ -10033,6 +10033,12 @@
                     gCamCapability[cameraId]->eeprom_version_info),
             sizeof(gCamCapability[cameraId]->eeprom_version_info));
     if (0 < eepromLength) {
+        char easelInfo[] = ",E:N";
+        char *eepromInfo = reinterpret_cast<char *>(gCamCapability[cameraId]->eeprom_version_info);
+        if (eepromLength + sizeof(easelInfo) < MAX_EEPROM_VERSION_INFO_LEN) {
+            eepromLength += sizeof(easelInfo);
+            strlcat(eepromInfo, (gHdrPlusClient ? ",E:Y" : ",E:N"),  MAX_EEPROM_VERSION_INFO_LEN);
+        }
         staticInfo.update(NEXUS_EXPERIMENTAL_2017_EEPROM_VERSION_INFO,
                 gCamCapability[cameraId]->eeprom_version_info, eepromLength);
     }
@@ -10309,6 +10315,14 @@
     int rc = 0;
 
     pthread_mutex_lock(&gCamLock);
+
+    rc = initHdrPlusClientLocked();
+    if (rc != OK) {
+        ALOGE("%s: initHdrPlusClientLocked failed: %s (%d)", __FUNCTION__, strerror(-rc), rc);
+        pthread_mutex_unlock(&gCamLock);
+        return rc;
+    }
+
     if (NULL == gCamCapability[cameraId]) {
         rc = initCapabilities(cameraId);
         if (rc < 0) {
@@ -10373,13 +10387,6 @@
     LOGI("camera %d resource cost is %d", cameraId,
             info->resource_cost);
 
-    rc = initHdrPlusClientLocked();
-    if (rc != OK) {
-        ALOGE("%s: initHdrPlusClientLocked failed: %s (%d)", __FUNCTION__, strerror(-rc), rc);
-        pthread_mutex_unlock(&gCamLock);
-        return rc;
-    }
-
     pthread_mutex_unlock(&gCamLock);
     return rc;
 }