diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2014-03-25 00:12:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-25 00:12:21 +0000 |
| commit | 0dfdcb10195c8b0f4e5ffbc662067363a4f7f3d9 (patch) | |
| tree | 2a13eaa00addaadd5280d273618b2e1a62058a14 /core/java/android/hardware/camera2 | |
| parent | 75c549c537cf44d1f1bb13422a950637f7f5c489 (diff) | |
| parent | e89b120eae1206dfff9abbb43d0075c23a5672cc (diff) | |
| download | frameworks_base-0dfdcb10195c8b0f4e5ffbc662067363a4f7f3d9.zip frameworks_base-0dfdcb10195c8b0f4e5ffbc662067363a4f7f3d9.tar.gz frameworks_base-0dfdcb10195c8b0f4e5ffbc662067363a4f7f3d9.tar.bz2 | |
Merge "camera3: Update whiteLevel/greenSplit docs."
Diffstat (limited to 'core/java/android/hardware/camera2')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraCharacteristics.java | 2 | ||||
| -rw-r--r-- | 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 45d6e88..37bead8 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.</p> * <p>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).</p> * diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index 03661f0..9bf1b98 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -1719,8 +1719,12 @@ public final class CaptureResult extends CameraMetadata { * filter array.</p> * <p>The green split is calculated as follows:</p> * <ol> - * <li>A representative 5x5 pixel window W within the active - * sensor array is chosen.</li> + * <li>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.</li> * <li>The arithmetic mean of the green channels from the red * rows (mean_Gr) within W is computed.</li> * <li>The arithmetic mean of the green channels from the blue |