summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2015-06-22 19:17:30 -0700
committerRuben Brunk <rubenbrunk@google.com>2015-06-23 16:23:03 -0700
commitb8f4c6ab1e99a44a51af26dc522819bb833825ab (patch)
tree61b805af575c892e4640ffe40e8361d5ce13d086 /core/java/android/hardware
parenta77ef4b8b4c11a9fdfdca030462b7b055bf533bc (diff)
downloadframeworks_base-b8f4c6ab1e99a44a51af26dc522819bb833825ab.zip
frameworks_base-b8f4c6ab1e99a44a51af26dc522819bb833825ab.tar.gz
frameworks_base-b8f4c6ab1e99a44a51af26dc522819bb833825ab.tar.bz2
Update DngCreator to handle pre-correction dimens.
Bug: 20491394 Change-Id: I0cdf7cec104bcb5683139c81fc52c8a0a7d2365c
Diffstat (limited to 'core/java/android/hardware')
-rw-r--r--core/java/android/hardware/camera2/DngCreator.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/hardware/camera2/DngCreator.java b/core/java/android/hardware/camera2/DngCreator.java
index 70afe5b..57a080b 100644
--- a/core/java/android/hardware/camera2/DngCreator.java
+++ b/core/java/android/hardware/camera2/DngCreator.java
@@ -284,6 +284,8 @@ public final class DngCreator implements AutoCloseable {
* {@code offset + 2 * width * height)} bytes. The width and height of
* the input are taken from the width and height set in the {@link DngCreator} metadata tags,
* and will typically be equal to the width and height of
+ * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE}. Prior to
+ * API level 23, this was always the same as
* {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE}.
* The pixel layout in the input is determined from the reported color filter arrangement (CFA)
* set in {@link CameraCharacteristics#SENSOR_INFO_COLOR_FILTER_ARRANGEMENT}. If insufficient
@@ -332,6 +334,8 @@ public final class DngCreator implements AutoCloseable {
* {@code offset + 2 * width * height)} bytes. The width and height of
* the input are taken from the width and height set in the {@link DngCreator} metadata tags,
* and will typically be equal to the width and height of
+ * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE}. Prior to
+ * API level 23, this was always the same as
* {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE}.
* The pixel layout in the input is determined from the reported color filter arrangement (CFA)
* set in {@link CameraCharacteristics#SENSOR_INFO_COLOR_FILTER_ARRANGEMENT}. If insufficient