Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ff214b6 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev

parents 0aaf843c f4eac129

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -12790,6 +12790,7 @@ package android.hardware.camera2 { 
    field public static final int CONTROL_SCENE_MODE_DISABLED = 0; // 0x0

    field public static final int CONTROL_SCENE_MODE_FACE_PRIORITY = 1; // 0x1

    field public static final int CONTROL_SCENE_MODE_FIREWORKS = 12; // 0xc

    field public static final int CONTROL_SCENE_MODE_HDR = 18; // 0x12

    field public static final int CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO = 17; // 0x11

    field public static final int CONTROL_SCENE_MODE_LANDSCAPE = 4; // 0x4

    field public static final int CONTROL_SCENE_MODE_NIGHT = 5; // 0x5

core/java/android/hardware/camera2/CameraMetadata.java

+34 −4
Original line number Diff line number Diff line
@@ -1648,11 +1648,41 @@ public abstract class CameraMetadata<TKey> { 
    public static final int CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO = 17;



    /**

     * <p>Turn on custom high dynamic range (HDR) mode.</p>

     * <p>This is intended for LEGACY mode devices only;

     * HAL3+ camera devices should not implement this mode.</p>

     * <p>Turn on a device-specific high dynamic range (HDR) mode.</p>

     * <p>In this scene mode, the camera device captures images

     * that keep a larger range of scene illumination levels

     * visible in the final image. For example, when taking a

     * picture of a object in front of a bright window, both

     * the object and the scene through the window may be

     * visible when using HDR mode, while in normal AUTO mode,

     * one or the other may be poorly exposed. As a tradeoff,

     * HDR mode generally takes much longer to capture a single

     * image, has no user control, and may have other artifacts

     * depending on the HDR method used.</p>

     * <p>Therefore, HDR captures operate at a much slower rate

     * than regular captures.</p>

     * <p>In this mode, on LIMITED or FULL devices, when a request

     * is made with a {@link CaptureRequest#CONTROL_CAPTURE_INTENT android.control.captureIntent} of

     * STILL_CAPTURE, the camera device will capture an image

     * using a high dynamic range capture technique.  On LEGACY

     * devices, captures that target a JPEG-format output will

     * be captured with HDR, and the capture intent is not

     * relevant.</p>

     * <p>The HDR capture may involve the device capturing a burst

     * of images internally and combining them into one, or it

     * may involve the device using specialized high dynamic

     * range capture hardware. In all cases, a single image is

     * 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

     * supported.</p>

     *

     * @see CaptureRequest#CONTROL_CAPTURE_INTENT

     * @see CaptureRequest#CONTROL_SCENE_MODE

     * @hide

     */

    public static final int CONTROL_SCENE_MODE_HDR = 18;

core/java/android/hardware/camera2/CaptureRequest.java

+2 −0
Original line number Diff line number Diff line
@@ -1294,6 +1294,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     *   <li>{@link #CONTROL_SCENE_MODE_CANDLELIGHT CANDLELIGHT}</li>

     *   <li>{@link #CONTROL_SCENE_MODE_BARCODE BARCODE}</li>

     *   <li>{@link #CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO HIGH_SPEED_VIDEO}</li>

     *   <li>{@link #CONTROL_SCENE_MODE_HDR HDR}</li>

     * </ul></p>

     * <p><b>Available values for this device:</b><br>

     * {@link CameraCharacteristics#CONTROL_AVAILABLE_SCENE_MODES android.control.availableSceneModes}</p>
@@ -1322,6 +1323,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * @see #CONTROL_SCENE_MODE_CANDLELIGHT

     * @see #CONTROL_SCENE_MODE_BARCODE

     * @see #CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO

     * @see #CONTROL_SCENE_MODE_HDR

     */

    @PublicKey

    public static final Key<Integer> CONTROL_SCENE_MODE =

core/java/android/hardware/camera2/CaptureResult.java

+2 −0
Original line number Diff line number Diff line
@@ -1910,6 +1910,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     *   <li>{@link #CONTROL_SCENE_MODE_CANDLELIGHT CANDLELIGHT}</li>

     *   <li>{@link #CONTROL_SCENE_MODE_BARCODE BARCODE}</li>

     *   <li>{@link #CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO HIGH_SPEED_VIDEO}</li>

     *   <li>{@link #CONTROL_SCENE_MODE_HDR HDR}</li>

     * </ul></p>

     * <p><b>Available values for this device:</b><br>

     * {@link CameraCharacteristics#CONTROL_AVAILABLE_SCENE_MODES android.control.availableSceneModes}</p>
@@ -1938,6 +1939,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * @see #CONTROL_SCENE_MODE_CANDLELIGHT

     * @see #CONTROL_SCENE_MODE_BARCODE

     * @see #CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO

     * @see #CONTROL_SCENE_MODE_HDR

     */

    @PublicKey

    public static final Key<Integer> CONTROL_SCENE_MODE =