diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2015-06-23 23:33:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-23 23:33:22 +0000 |
| commit | a39fcc58753000435e963b473bad954a337604f2 (patch) | |
| tree | d58e874af4dac1b01ce09d8aa522531c9cb650d9 /core/java | |
| parent | 8a0fd13081af16b18aaca6cb38ed9b252169df56 (diff) | |
| parent | b8f4c6ab1e99a44a51af26dc522819bb833825ab (diff) | |
| download | frameworks_base-a39fcc58753000435e963b473bad954a337604f2.zip frameworks_base-a39fcc58753000435e963b473bad954a337604f2.tar.gz frameworks_base-a39fcc58753000435e963b473bad954a337604f2.tar.bz2 | |
Merge "Update DngCreator to handle pre-correction dimens." into mnc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/hardware/camera2/DngCreator.java | 4 |
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 |