Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Camera2: Add a missing key for controlling shading map mode" into klp-dev

Browse Source
This commit is contained in:
Eino-Ville Talvala
2013-09-12 18:32:29 +00:00
committed by Android (Google) Code Review
parent 8f435baca8 d96748b02a
commit 184b17ddef
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/hardware/camera2/CameraMetadata.java
View File

@@ -873,6 +873,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
//

16
core/java/android/hardware/camera2/CaptureRequest.java
View File

@@ -955,6 +955,22 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable {
public static final Key<Integer> STATISTICS_FACE_DETECT_MODE =
new Key<Integer>("android.statistics.faceDetectMode", int.class);
/**
* <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