From e89b120eae1206dfff9abbb43d0075c23a5672cc Mon Sep 17 00:00:00 2001
From: Ruben Brunk
Date: Mon, 24 Mar 2014 17:10:35 -0700
Subject: [PATCH] camera3: Update whiteLevel/greenSplit docs.
Bug: 13191430
Change-Id: I61cab65da546bdf1a748f46c28b6fce218b27bc4
---
.../android/hardware/camera2/CameraCharacteristics.java | 2 +-
core/java/android/hardware/camera2/CaptureResult.java | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java
index 45d6e885766ca..37bead845e056 100644
--- a/core/java/android/hardware/camera2/CameraCharacteristics.java
+++ b/core/java/android/hardware/camera2/CameraCharacteristics.java
@@ -1007,7 +1007,7 @@ public final class CameraCharacteristics extends CameraMetadata {
* each channel is specified by the offset in the
* {@link CameraCharacteristics#SENSOR_BLACK_LEVEL_PATTERN android.sensor.blackLevelPattern} tag.
* The white level is typically determined either by sensor bit depth
- * (10-14 bits is expected), or by the point where the sensor response
+ * (8-14 bits is expected), or by the point where the sensor response
* becomes too non-linear to be useful. The default value for this is
* maximum representable value for a 16-bit raw sample (2^16 - 1).
*
diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java
index 7eb63d6867551..f528bdd560f1a 100644
--- a/core/java/android/hardware/camera2/CaptureResult.java
+++ b/core/java/android/hardware/camera2/CaptureResult.java
@@ -1720,8 +1720,12 @@ public final class CaptureResult extends CameraMetadata {
* filter array.
* The green split is calculated as follows:
*
- * - A representative 5x5 pixel window W within the active
- * sensor array is chosen.
+ * - A 5x5 pixel (or larger) window W within the active sensor array is
+ * chosen. The term 'pixel' here is taken to mean a group of 4 Bayer
+ * mosaic channels (R, Gr, Gb, B). The location and size of the window
+ * chosen is implementation defined, and should be chosen to provide a
+ * green split estimate that is both representative of the entire image
+ * for this camera sensor, and can be calculated quickly.
* - The arithmetic mean of the green channels from the red
* rows (mean_Gr) within W is computed.
* - The arithmetic mean of the green channels from the blue