commit b4a4ce099566bedd9854b5ce360be698b958dd5b
author Mansoor Aftab <maftab@codeaurora.org> Thu Mar 27 10:18:18 2014 -0700
committer Vineeta Srivastava <vsrivastava@google.com> Fri Apr 11 09:32:59 2014 -0700
tree 2f43a8e369ffc4e66ee56d7322cb03c8fde93ac4
parent 8b6db070047670e19d5dd5d7e0765c99347c07a7

Camera3: Implement android.sensor.greenSplit

Report the green split value calculated using the sensor OTP data

Bug: 13191901
Change-Id: I492af93961b61952e35126e9ddf148796416c61a

Conflicts:
	QCamera2/stack/common/cam_intf.h
	QCamera2/stack/common/cam_types.h

camera/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp
index 5f474ef..e7789ab 100644
--- a/camera/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp
@@ -2219,6 +2219,13 @@
              break;
 
           }
+
+          case CAM_INTF_META_OTP_WB_GRGB:{
+             float *otpWbGrGb = (float*) POINTER_OF(CAM_INTF_META_OTP_WB_GRGB, metadata);
+             camMetadata.update(ANDROID_SENSOR_GREEN_SPLIT, otpWbGrGb, 1);
+             break;
+          }
+
           case CAM_INTF_META_BLACK_LEVEL_LOCK:{
              uint8_t *blackLevelLock = (uint8_t*)
                POINTER_OF(CAM_INTF_META_BLACK_LEVEL_LOCK, metadata);

camera/QCamera2/stack/common/cam_intf.h

diff --git a/camera/QCamera2/stack/common/cam_intf.h b/camera/QCamera2/stack/common/cam_intf.h
index 314c740..a9fcd82 100755
--- a/camera/QCamera2/stack/common/cam_intf.h
+++ b/camera/QCamera2/stack/common/cam_intf.h
@@ -519,6 +519,7 @@
     /* HAL internal metadata */
     INCLUDE(CAM_INTF_META_AEC_INFO,                     cam_3a_params_t,             1);
     INCLUDE(CAM_INTF_META_TEST_PATTERN_DATA,            cam_test_pattern_data_t,     1);
+    INCLUDE(CAM_INTF_META_OTP_WB_GRGB,                  float,                       1);
     INCLUDE(CAM_INTF_META_PRIVATE_DATA,                 char,                        MAX_METADATA_PAYLOAD_SIZE);
 } metadata_type_t;
 

camera/QCamera2/stack/common/cam_types.h

diff --git a/camera/QCamera2/stack/common/cam_types.h b/camera/QCamera2/stack/common/cam_types.h
index aa301cb..9174303 100644
--- a/camera/QCamera2/stack/common/cam_types.h
+++ b/camera/QCamera2/stack/common/cam_types.h
@@ -1084,6 +1084,8 @@
     CAM_INTF_META_JPEG_THUMB_QUALITY,
     CAM_INTF_META_JPEG_THUMB_SIZE,
 
+    /* OTP : WB gr/gb */
+    CAM_INTF_META_OTP_WB_GRGB,
     CAM_INTF_PARM_MAX
 } cam_intf_parm_type_t;