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

am 499b0d9f: am a0807a65: Merge "Camera: tonemap linkify update" into mnc-dev

Browse Source 
* commit '499b0d9fd3f1c7c3eec8bc2d6d3c989f1a7c5fd6':
  Camera: tonemap linkify update
This commit is contained in:
Yin-Chia Yeh
2015-05-14 22:34:01 +00:00
committed by Android Git Automerger
parent 33db304c16 499b0d9fd3
commit d2115eaa66
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -388,8 +388,8 @@ public abstract class CameraMetadata<TKey> {
* <li>{@link CaptureRequest#TONEMAP_CURVE android.tonemap.curve}</li> * <li>{@link CaptureRequest#TONEMAP_CURVE android.tonemap.curve}</li>
* <li>{@link CaptureRequest#TONEMAP_MODE android.tonemap.mode}</li> * <li>{@link CaptureRequest#TONEMAP_MODE android.tonemap.mode}</li>
* <li>{@link CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS android.tonemap.maxCurvePoints}</li> * <li>{@link CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS android.tonemap.maxCurvePoints}</li>
* <li>android.tonemap.gamma</li> * <li>{@link CaptureRequest#TONEMAP_GAMMA android.tonemap.gamma}</li>
* <li>android.tonemap.presetCurve</li> * <li>{@link CaptureRequest#TONEMAP_PRESET_CURVE android.tonemap.presetCurve}</li>
* </ul> * </ul>
* </li> * </li>
* <li> * <li>
@@ -429,8 +429,10 @@ public abstract class CameraMetadata<TKey> {
* @see CaptureRequest#SHADING_MODE * @see CaptureRequest#SHADING_MODE
* @see CaptureRequest#STATISTICS_LENS_SHADING_MAP_MODE * @see CaptureRequest#STATISTICS_LENS_SHADING_MAP_MODE
* @see CaptureRequest#TONEMAP_CURVE * @see CaptureRequest#TONEMAP_CURVE
* @see CaptureRequest#TONEMAP_GAMMA
* @see CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS * @see CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS
* @see CaptureRequest#TONEMAP_MODE * @see CaptureRequest#TONEMAP_MODE
* @see CaptureRequest#TONEMAP_PRESET_CURVE
* @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES
*/ */
public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING = 2; public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING = 2;
@@ -2185,22 +2187,26 @@ public abstract class CameraMetadata<TKey> {
public static final int TONEMAP_MODE_HIGH_QUALITY = 2; public static final int TONEMAP_MODE_HIGH_QUALITY = 2;
/** /**
* <p>Use the gamma value specified in android.tonemap.gamma to peform * <p>Use the gamma value specified in {@link CaptureRequest#TONEMAP_GAMMA android.tonemap.gamma} to peform
* tonemapping.</p> * tonemapping.</p>
* <p>All color enhancement and tonemapping must be disabled, except * <p>All color enhancement and tonemapping must be disabled, except
* for applying the tonemapping curve specified by android.tonemap.gamma.</p> * for applying the tonemapping curve specified by {@link CaptureRequest#TONEMAP_GAMMA android.tonemap.gamma}.</p>
* <p>Must not slow down frame rate relative to raw sensor output.</p> * <p>Must not slow down frame rate relative to raw sensor output.</p>
*
* @see CaptureRequest#TONEMAP_GAMMA
* @see CaptureRequest#TONEMAP_MODE * @see CaptureRequest#TONEMAP_MODE
*/ */
public static final int TONEMAP_MODE_GAMMA_VALUE = 3; public static final int TONEMAP_MODE_GAMMA_VALUE = 3;
/** /**
* <p>Use the preset tonemapping curve specified in * <p>Use the preset tonemapping curve specified in
* android.tonemap.presetCurve to peform tonemapping.</p> * {@link CaptureRequest#TONEMAP_PRESET_CURVE android.tonemap.presetCurve} to peform tonemapping.</p>
* <p>All color enhancement and tonemapping must be disabled, except * <p>All color enhancement and tonemapping must be disabled, except
* for applying the tonemapping curve specified by * for applying the tonemapping curve specified by
* android.tonemap.presetCurve.</p> * {@link CaptureRequest#TONEMAP_PRESET_CURVE android.tonemap.presetCurve}.</p>
* <p>Must not slow down frame rate relative to raw sensor output.</p> * <p>Must not slow down frame rate relative to raw sensor output.</p>
*
* @see CaptureRequest#TONEMAP_PRESET_CURVE
* @see CaptureRequest#TONEMAP_MODE * @see CaptureRequest#TONEMAP_MODE
*/ */
public static final int TONEMAP_MODE_PRESET_CURVE = 4; public static final int TONEMAP_MODE_PRESET_CURVE = 4;