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

Commit 62932179 authored by Ruben Brunk's avatar Ruben Brunk Committed by Android (Google) Code Review
Browse files

Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-dev

parents be50bd76 ff99a0ad

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

+7 −0
Original line number Diff line number Diff line
@@ -1575,6 +1575,13 @@ 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>

     * @see CaptureRequest#CONTROL_SCENE_MODE

     * @hide

     */

    public static final int CONTROL_SCENE_MODE_HDR = 18;



    //

    // Enumeration values for CaptureRequest#CONTROL_VIDEO_STABILIZATION_MODE

    //

core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java

+2 −0
Original line number Diff line number Diff line
@@ -882,6 +882,7 @@ public class LegacyMetadataMapper { 
        Parameters.SCENE_MODE_PARTY,

        Parameters.SCENE_MODE_CANDLELIGHT,

        Parameters.SCENE_MODE_BARCODE,

        Parameters.SCENE_MODE_HDR,

    };



    private final static int[] sSceneModes = {
@@ -901,6 +902,7 @@ public class LegacyMetadataMapper { 
        CameraCharacteristics.CONTROL_SCENE_MODE_PARTY,

        CameraCharacteristics.CONTROL_SCENE_MODE_CANDLELIGHT,

        CameraCharacteristics.CONTROL_SCENE_MODE_BARCODE,

        CameraCharacteristics.CONTROL_SCENE_MODE_HDR,

    };



    static int convertSceneModeFromLegacy(String mode) {