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

Merge "Camera: Allow preview operation of SCENE_MODE_HDR" into nyc-dev

Browse Source
This commit is contained in:
Eino-Ville Talvala
2016-04-04 19:38:51 +00:00
committed by Android (Google) Code Review
parent ecfbb0a1bb c7c569d5e4
commit 68a5811711
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2025,11 +2025,20 @@ public abstract class CameraMetadata<TKey> {
* produced in response to a capture request submitted
* while in HDR mode.</p>
* <p>Since substantial post-processing is generally needed to
* produce an HDR image, only YUV and JPEG outputs are
* supported for LIMITED/FULL device HDR captures, and only
* JPEG outputs are supported for LEGACY HDR
* captures. Using a RAW output for HDR capture is not
* produce an HDR image, only YUV, PRIVATE, and JPEG
* outputs are supported for LIMITED/FULL device HDR
* captures, and only JPEG outputs are supported for LEGACY
* HDR captures. Using a RAW output for HDR capture is not
* supported.</p>
* <p>Some devices may also support always-on HDR, which
* applies HDR processing at full frame rate. For these
* devices, intents other than STILL_CAPTURE will also
* produce an HDR output with no frame rate impact compared
* to normal operation, though the quality may be lower
* than for STILL_CAPTURE intents.</p>
* <p>If SCENE_MODE_HDR is used with unsupported output types
* or capture intents, the images captured will be as if
* the SCENE_MODE was not enabled at all.</p>
*
* @see CaptureRequest#CONTROL_CAPTURE_INTENT
* @see CaptureRequest#CONTROL_SCENE_MODE

3
core/java/android/hardware/camera2/CaptureResult.java
View File

@@ -3373,7 +3373,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
/**
* <p>Maximum raw value output by sensor for this frame.</p>
* <p>Since the android.sensor.blackLevel may change for different
* <p>Since the {@link CameraCharacteristics#SENSOR_BLACK_LEVEL_PATTERN android.sensor.blackLevelPattern} may change for different
* capture settings (e.g., {@link CaptureRequest#SENSOR_SENSITIVITY android.sensor.sensitivity}), the white
* level will change accordingly. This key is similar to
* {@link CameraCharacteristics#SENSOR_INFO_WHITE_LEVEL android.sensor.info.whiteLevel}, but specifies the camera device
@@ -3385,6 +3385,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
* &gt;= 0</p>
* <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
*
* @see CameraCharacteristics#SENSOR_BLACK_LEVEL_PATTERN
* @see CameraCharacteristics#SENSOR_INFO_WHITE_LEVEL
* @see CameraCharacteristics#SENSOR_OPTICAL_BLACK_REGIONS
* @see CaptureRequest#SENSOR_SENSITIVITY