commit 11336a8b8b5d83f2b880c44c4dda053ac9082773
author Shuzhen Wang <shuzhenwang@google.com> Tue May 01 09:34:15 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 01 09:34:15 2018 -0700
tree 805e198b6e889dc38f1432d89e3546acd0d64c46
parent 64f6352c42150065ac47852dd04d583f571a63dd
parent 514d6f75c80d1d6804ff4f5998e460cdfb8e24ba

QCamera2: HAL3: Make EXIF_ISO calculation consistent
am: 514d6f75c8

Change-Id: If751614fdf5f6ee2e2485f6cfa8bdbdfa1b2156b

msm8998/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_exif.c

diff --git a/msm8998/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_exif.c b/msm8998/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_exif.c
index 6f82ff5..deebb25 100644
--- a/msm8998/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_exif.c
+++ b/msm8998/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_exif.c
@@ -572,18 +572,20 @@
         LOGE("Cannot extract SENSOR_SENSITIVITY value");
       }
 
+      int32_t ispSensitivity = 100;
       IF_META_AVAILABLE(int32_t, isp_iso, CAM_INTF_META_ISP_SENSITIVITY, p_meta) {
-        p_3a_params.iso_value= p_3a_params.iso_value * (*isp_iso) / 100;
+        ispSensitivity = *isp_iso;
       } else {
         LOGE("Cannot extract ISP_SENSITIVITY value");
       }
 
       IF_META_AVAILABLE(float, post_stats_iso, CAM_INTF_META_ISP_POST_STATS_SENSITIVITY, p_meta) {
-        p_3a_params.iso_value= p_3a_params.iso_value * (*post_stats_iso);
+        ispSensitivity *= *post_stats_iso;
       } else {
         /* CAM_INTF_META_ISP_POST_STATS_SENSITIVITY is optional */
         LOGD("Cannot extract ISP_POST_STATS_SENSITIVITY value");
       }
+      p_3a_params.iso_value= p_3a_params.iso_value * ispSensitivity / 100;
 
       IF_META_AVAILABLE(int64_t, sensor_exposure_time,
           CAM_INTF_META_SENSOR_EXPOSURE_TIME, p_meta) {