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

Commit 9b30512e authored by Ruben Brunk's avatar Ruben Brunk
Browse files

camera3: Fix raw/DNG tag visibilility. 

Change-Id: Ie3beed773b27bf56689a750e695ac7cb82580639
parent 8eb91e9f

api/current.txt

+20 −0
Original line number Diff line number Diff line
@@ -11497,6 +11497,25 @@ package android.hardware.camera2 { 
    field public static final int REQUEST_AVAILABLE_CAPABILITIES_ZSL = 4; // 0x4

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

    field public static final int SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT = 0; // 0x0

    field public static final int SENSOR_REFERENCE_ILLUMINANT_CLOUDY_WEATHER = 10; // 0xa

    field public static final int SENSOR_REFERENCE_ILLUMINANT_COOL_WHITE_FLUORESCENT = 14; // 0xe

    field public static final int SENSOR_REFERENCE_ILLUMINANT_D50 = 23; // 0x17

    field public static final int SENSOR_REFERENCE_ILLUMINANT_D55 = 20; // 0x14

    field public static final int SENSOR_REFERENCE_ILLUMINANT_D65 = 21; // 0x15

    field public static final int SENSOR_REFERENCE_ILLUMINANT_D75 = 22; // 0x16

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

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

    field public static final int SENSOR_REFERENCE_ILLUMINANT_DAY_WHITE_FLUORESCENT = 13; // 0xd

    field public static final int SENSOR_REFERENCE_ILLUMINANT_FINE_WEATHER = 9; // 0x9

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

    field public static final int SENSOR_REFERENCE_ILLUMINANT_FLUORESCENT = 2; // 0x2

    field public static final int SENSOR_REFERENCE_ILLUMINANT_ISO_STUDIO_TUNGSTEN = 24; // 0x18

    field public static final int SENSOR_REFERENCE_ILLUMINANT_SHADE = 11; // 0xb

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

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

    field public static final int SENSOR_REFERENCE_ILLUMINANT_STANDARD_C = 19; // 0x13

    field public static final int SENSOR_REFERENCE_ILLUMINANT_TUNGSTEN = 3; // 0x3

    field public static final int SENSOR_REFERENCE_ILLUMINANT_WHITE_FLUORESCENT = 15; // 0xf

    field public static final int SENSOR_TEST_PATTERN_MODE_COLOR_BARS = 2; // 0x2

    field public static final int SENSOR_TEST_PATTERN_MODE_COLOR_BARS_FADE_TO_GRAY = 3; // 0x3

    field public static final int SENSOR_TEST_PATTERN_MODE_CUSTOM1 = 256; // 0x100
@@ -11651,6 +11670,7 @@ package android.hardware.camera2 { 
    field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_NEUTRAL_COLOR_POINT;

    field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_PROFILE_HUE_SAT_MAP;

    field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_PROFILE_TONE_CURVE;

    field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_REFERENCE_ILLUMINANT;

    field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_SENSITIVITY;

    field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_TEMPERATURE;

    field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_TEST_PATTERN_MODE;

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

+104 −0
Original line number Diff line number Diff line
@@ -1669,6 +1669,110 @@ public abstract class CameraMetadata { 
     */

    public static final int LENS_STATE_MOVING = 1;



    //

    // Enumeration values for CaptureResult#SENSOR_REFERENCE_ILLUMINANT

    //



    /**

     * @see CaptureResult#SENSOR_REFERENCE_ILLUMINANT

     */

    public static final int SENSOR_REFERENCE_ILLUMINANT_DAYLIGHT = 1;



    /**

     * @see CaptureResult#SENSOR_REFERENCE_ILLUMINANT

     */

    public static final int SENSOR_REFERENCE_ILLUMINANT_FLUORESCENT = 2;



    /**

     * <p>Incandescent light</p>

     * @see CaptureResult#SENSOR_REFERENCE_ILLUMINANT

     */

    public static final int SENSOR_REFERENCE_ILLUMINANT_TUNGSTEN = 3;



    /**

     * @see CaptureResult#SENSOR_REFERENCE_ILLUMINANT

     */

    public static final int SENSOR_REFERENCE_ILLUMINANT_FLASH = 4;



    /**

     * @see CaptureResult#SENSOR_REFERENCE_ILLUMINANT

     */

    public static final int SENSOR_REFERENCE_ILLUMINANT_FINE_WEATHER = 9;



    /**

     * @see CaptureResult#SENSOR_REFERENCE_ILLUMINANT

     */

    public static final int SENSOR_REFERENCE_ILLUMINANT_CLOUDY_WEATHER = 10;



    /**

     * @see CaptureResult#SENSOR_REFERENCE_ILLUMINANT

     */

    public static final int SENSOR_REFERENCE_ILLUMINANT_SHADE = 11;



    /**

     * <p>D 5700 - 7100K</p>

     * @see CaptureResult#SENSOR_REFERENCE_ILLUMINANT

     */

    public static final int SENSOR_REFERENCE_ILLUMINANT_DAYLIGHT_FLUORESCENT = 12;



    /**

     * <p>N 4600 - 5400K</p>

     * @see CaptureResult#SENSOR_REFERENCE_ILLUMINANT

     */

    public static final int SENSOR_REFERENCE_ILLUMINANT_DAY_WHITE_FLUORESCENT = 13;



    /**

     * <p>W 3900 - 4500K</p>

     * @see CaptureResult#SENSOR_REFERENCE_ILLUMINANT

     */

    public static final int SENSOR_REFERENCE_ILLUMINANT_COOL_WHITE_FLUORESCENT = 14;



    /**

     * <p>WW 3200 - 3700K</p>

     * @see CaptureResult#SENSOR_REFERENCE_ILLUMINANT

     */

    public static final int SENSOR_REFERENCE_ILLUMINANT_WHITE_FLUORESCENT = 15;



    /**

     * @see CaptureResult#SENSOR_REFERENCE_ILLUMINANT

     */

    public static final int SENSOR_REFERENCE_ILLUMINANT_STANDARD_A = 17;



    /**

     * @see CaptureResult#SENSOR_REFERENCE_ILLUMINANT

     */

    public static final int SENSOR_REFERENCE_ILLUMINANT_STANDARD_B = 18;



    /**

     * @see CaptureResult#SENSOR_REFERENCE_ILLUMINANT

     */

    public static final int SENSOR_REFERENCE_ILLUMINANT_STANDARD_C = 19;



    /**

     * @see CaptureResult#SENSOR_REFERENCE_ILLUMINANT

     */

    public static final int SENSOR_REFERENCE_ILLUMINANT_D55 = 20;



    /**

     * @see CaptureResult#SENSOR_REFERENCE_ILLUMINANT

     */

    public static final int SENSOR_REFERENCE_ILLUMINANT_D65 = 21;



    /**

     * @see CaptureResult#SENSOR_REFERENCE_ILLUMINANT

     */

    public static final int SENSOR_REFERENCE_ILLUMINANT_D75 = 22;



    /**

     * @see CaptureResult#SENSOR_REFERENCE_ILLUMINANT

     */

    public static final int SENSOR_REFERENCE_ILLUMINANT_D50 = 23;



    /**

     * @see CaptureResult#SENSOR_REFERENCE_ILLUMINANT

     */

    public static final int SENSOR_REFERENCE_ILLUMINANT_ISO_STUDIO_TUNGSTEN = 24;



    //

    // Enumeration values for CaptureResult#STATISTICS_SCENE_FLICKER

    //

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

+30 −0
Original line number Diff line number Diff line
@@ -1458,6 +1458,36 @@ public final class CaptureResult extends CameraMetadata { 
    public static final Key<Float> SENSOR_TEMPERATURE =

            new Key<Float>("android.sensor.temperature", float.class);



    /**

     * <p>A reference illumination source roughly matching the current scene

     * illumination, which is used to describe the sensor color space

     * transformations.</p>

     * <p>The values in this tag correspond to the values defined for the

     * EXIF LightSource tag. These illuminants are standard light sources

     * that are often used for calibrating camera devices.</p>

     * @see #SENSOR_REFERENCE_ILLUMINANT_DAYLIGHT

     * @see #SENSOR_REFERENCE_ILLUMINANT_FLUORESCENT

     * @see #SENSOR_REFERENCE_ILLUMINANT_TUNGSTEN

     * @see #SENSOR_REFERENCE_ILLUMINANT_FLASH

     * @see #SENSOR_REFERENCE_ILLUMINANT_FINE_WEATHER

     * @see #SENSOR_REFERENCE_ILLUMINANT_CLOUDY_WEATHER

     * @see #SENSOR_REFERENCE_ILLUMINANT_SHADE

     * @see #SENSOR_REFERENCE_ILLUMINANT_DAYLIGHT_FLUORESCENT

     * @see #SENSOR_REFERENCE_ILLUMINANT_DAY_WHITE_FLUORESCENT

     * @see #SENSOR_REFERENCE_ILLUMINANT_COOL_WHITE_FLUORESCENT

     * @see #SENSOR_REFERENCE_ILLUMINANT_WHITE_FLUORESCENT

     * @see #SENSOR_REFERENCE_ILLUMINANT_STANDARD_A

     * @see #SENSOR_REFERENCE_ILLUMINANT_STANDARD_B

     * @see #SENSOR_REFERENCE_ILLUMINANT_STANDARD_C

     * @see #SENSOR_REFERENCE_ILLUMINANT_D55

     * @see #SENSOR_REFERENCE_ILLUMINANT_D65

     * @see #SENSOR_REFERENCE_ILLUMINANT_D75

     * @see #SENSOR_REFERENCE_ILLUMINANT_D50

     * @see #SENSOR_REFERENCE_ILLUMINANT_ISO_STUDIO_TUNGSTEN

     */

    public static final Key<Integer> SENSOR_REFERENCE_ILLUMINANT =

            new Key<Integer>("android.sensor.referenceIlluminant", int.class);



    /**

     * <p>A per-device calibration transform matrix to be applied after the

     * color space transform when rendering the raw image buffer.</p>