diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-09-12 18:32:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-12 18:32:29 +0000 |
| commit | 184b17ddef985ba99f1b1ad8f660a742a9f31a19 (patch) | |
| tree | 2fc271d9ba3982e991faa91c2763c4c26bbaef2f /core/java/android/hardware | |
| parent | 8f435baca8b5285a6b4658fc9563f5fcbbdafc6e (diff) | |
| parent | d96748b02a468e484f864f4e3e4b7819f7dcdbd0 (diff) | |
| download | frameworks_base-184b17ddef985ba99f1b1ad8f660a742a9f31a19.zip frameworks_base-184b17ddef985ba99f1b1ad8f660a742a9f31a19.tar.gz frameworks_base-184b17ddef985ba99f1b1ad8f660a742a9f31a19.tar.bz2 | |
Merge "Camera2: Add a missing key for controlling shading map mode" into klp-dev
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraMetadata.java | 14 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CaptureRequest.java | 16 |
2 files changed, 30 insertions, 0 deletions
diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index 361e7de..ec23f08 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -874,6 +874,20 @@ public abstract class CameraMetadata { public static final int STATISTICS_FACE_DETECT_MODE_FULL = 2; // + // Enumeration values for CaptureRequest#STATISTICS_LENS_SHADING_MAP_MODE + // + + /** + * @see CaptureRequest#STATISTICS_LENS_SHADING_MAP_MODE + */ + public static final int STATISTICS_LENS_SHADING_MAP_MODE_OFF = 0; + + /** + * @see CaptureRequest#STATISTICS_LENS_SHADING_MAP_MODE + */ + public static final int STATISTICS_LENS_SHADING_MAP_MODE_ON = 1; + + // // Enumeration values for CaptureRequest#TONEMAP_MODE // diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index c3a636d..4608ab9 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -957,6 +957,22 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { /** * <p> + * Whether the HAL needs to output the lens + * shading map in output result metadata + * </p> + * <p> + * When set to ON, + * android.statistics.lensShadingMap must be provided in + * the output result metdata. + * </p> + * @see #STATISTICS_LENS_SHADING_MAP_MODE_OFF + * @see #STATISTICS_LENS_SHADING_MAP_MODE_ON + */ + public static final Key<Integer> STATISTICS_LENS_SHADING_MAP_MODE = + new Key<Integer>("android.statistics.lensShadingMapMode", int.class); + + /** + * <p> * Table mapping blue input values to output * values * </p> |