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

Commit 194ea7d9 authored by Igor Murashkin's avatar Igor Murashkin Committed by Android (Google) Code Review
Browse files

Merge "camera2 api: Output classes for key types where it makes sense"

parents 0f4ab97c 27b62ae8

core/java/android/hardware/photography/CameraPropertiesKeys.java

+12 −12
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ public final class CameraPropertiesKeys { 
    }



    public static final class Jpeg {

        public static final Key<int[]> AVAILABLE_THUMBNAIL_SIZES =

                new Key<int[]>("android.jpeg.availableThumbnailSizes", int[].class);

        public static final Key<android.hardware.photography.Size[]> AVAILABLE_THUMBNAIL_SIZES =

                new Key<android.hardware.photography.Size[]>("android.jpeg.availableThumbnailSizes", android.hardware.photography.Size[].class);



    }
@@ -90,8 +90,8 @@ public final class CameraPropertiesKeys { 
                    new Key<Float>("android.lens.info.hyperfocalDistance", float.class);

            public static final Key<Float> MINIMUM_FOCUS_DISTANCE =

                    new Key<Float>("android.lens.info.minimumFocusDistance", float.class);

            public static final Key<int[]> SHADING_MAP_SIZE =

                    new Key<int[]>("android.lens.info.shadingMapSize", int[].class);

            public static final Key<android.hardware.photography.Size> SHADING_MAP_SIZE =

                    new Key<android.hardware.photography.Size>("android.lens.info.shadingMapSize", android.hardware.photography.Size.class);

        }



            public static final class FacingKey extends Key<Lens.FacingKey.Enum> {
@@ -161,29 +161,29 @@ public final class CameraPropertiesKeys { 
                new AvailableFormatsKey("android.scaler.availableFormats");

        public static final Key<long[]> AVAILABLE_JPEG_MIN_DURATIONS =

                new Key<long[]>("android.scaler.availableJpegMinDurations", long[].class);

        public static final Key<int[]> AVAILABLE_JPEG_SIZES =

                new Key<int[]>("android.scaler.availableJpegSizes", int[].class);

        public static final Key<android.hardware.photography.Size[]> AVAILABLE_JPEG_SIZES =

                new Key<android.hardware.photography.Size[]>("android.scaler.availableJpegSizes", android.hardware.photography.Size[].class);

        public static final Key<Float> AVAILABLE_MAX_DIGITAL_ZOOM =

                new Key<Float>("android.scaler.availableMaxDigitalZoom", float.class);

        public static final Key<long[]> AVAILABLE_PROCESSED_MIN_DURATIONS =

                new Key<long[]>("android.scaler.availableProcessedMinDurations", long[].class);

        public static final Key<int[]> AVAILABLE_PROCESSED_SIZES =

                new Key<int[]>("android.scaler.availableProcessedSizes", int[].class);

        public static final Key<android.hardware.photography.Size[]> AVAILABLE_PROCESSED_SIZES =

                new Key<android.hardware.photography.Size[]>("android.scaler.availableProcessedSizes", android.hardware.photography.Size[].class);



    }



    public static final class Sensor {

        public static final class Info {

            public static final Key<int[]> ACTIVE_ARRAY_SIZE =

                    new Key<int[]>("android.sensor.info.activeArraySize", int[].class);

            public static final Key<android.graphics.Rect> ACTIVE_ARRAY_SIZE =

                    new Key<android.graphics.Rect>("android.sensor.info.activeArraySize", android.graphics.Rect.class);

            public static final Key<int[]> SENSITIVITY_RANGE =

                    new Key<int[]>("android.sensor.info.sensitivityRange", int[].class);

            public static final Key<long[]> EXPOSURE_TIME_RANGE =

                    new Key<long[]>("android.sensor.info.exposureTimeRange", long[].class);

            public static final Key<Long> MAX_FRAME_DURATION =

                    new Key<Long>("android.sensor.info.maxFrameDuration", long.class);

            public static final Key<float[]> PHYSICAL_SIZE =

                    new Key<float[]>("android.sensor.info.physicalSize", float[].class);

            public static final Key<android.hardware.photography.Size> PHYSICAL_SIZE =

                    new Key<android.hardware.photography.Size>("android.sensor.info.physicalSize", android.hardware.photography.Size.class);

        }

        public static final Key<Rational> BASE_GAIN_FACTOR =

                new Key<Rational>("android.sensor.baseGainFactor", Rational.class);

core/java/android/hardware/photography/CaptureRequestKeys.java

+16 −104
Original line number Diff line number Diff line
@@ -93,25 +93,8 @@ public final class CaptureRequestKeys { 
                new AeAntibandingModeKey("android.control.aeAntibandingMode");

        public static final Key<Integer> AE_EXPOSURE_COMPENSATION =

                new Key<Integer>("android.control.aeExposureCompensation", int.class);



            public static final class AeLockKey extends Key<Control.AeLockKey.Enum> {

                public enum Enum {

                    OFF,

                    ON;

                }



                public static final Enum OFF = Enum.OFF;

                public static final Enum ON = Enum.ON;



                // TODO: remove requirement for constructor by making Key an interface

                private AeLockKey(String name) {

                    super(name, Control.AeLockKey.Enum.class);

                }



            }



        public static final Key<Control.AeLockKey.Enum> AE_LOCK =

                new AeLockKey("android.control.aeLock");

        public static final Key<Boolean> AE_LOCK =

                new Key<Boolean>("android.control.aeLock", boolean.class);



            public static final class AeModeKey extends Key<Control.AeModeKey.Enum> {

                public enum Enum {
@@ -210,25 +193,8 @@ public final class CaptureRequestKeys { 


        public static final Key<Control.AfTriggerKey.Enum> AF_TRIGGER =

                new AfTriggerKey("android.control.afTrigger");



            public static final class AwbLockKey extends Key<Control.AwbLockKey.Enum> {

                public enum Enum {

                    OFF,

                    ON;

                }



                public static final Enum OFF = Enum.OFF;

                public static final Enum ON = Enum.ON;



                // TODO: remove requirement for constructor by making Key an interface

                private AwbLockKey(String name) {

                    super(name, Control.AwbLockKey.Enum.class);

                }



            }



        public static final Key<Control.AwbLockKey.Enum> AWB_LOCK =

                new AwbLockKey("android.control.awbLock");

        public static final Key<Boolean> AWB_LOCK =

                new Key<Boolean>("android.control.awbLock", boolean.class);



            public static final class AwbModeKey extends Key<Control.AwbModeKey.Enum> {

                public enum Enum {
@@ -415,25 +381,8 @@ public final class CaptureRequestKeys { 


        public static final Key<Control.SceneModeKey.Enum> SCENE_MODE =

                new SceneModeKey("android.control.sceneMode");



            public static final class VideoStabilizationModeKey extends Key<Control.VideoStabilizationModeKey.Enum> {

                public enum Enum {

                    OFF,

                    ON;

                }



                public static final Enum OFF = Enum.OFF;

                public static final Enum ON = Enum.ON;



                // TODO: remove requirement for constructor by making Key an interface

                private VideoStabilizationModeKey(String name) {

                    super(name, Control.VideoStabilizationModeKey.Enum.class);

                }



            }



        public static final Key<Control.VideoStabilizationModeKey.Enum> VIDEO_STABILIZATION_MODE =

                new VideoStabilizationModeKey("android.control.videoStabilizationMode");

        public static final Key<Boolean> VIDEO_STABILIZATION_MODE =

                new Key<Boolean>("android.control.videoStabilizationMode", boolean.class);



    }
@@ -490,8 +439,8 @@ public final class CaptureRequestKeys { 
    public static final class Jpeg {

        public static final Key<double[]> GPS_COORDINATES =

                new Key<double[]>("android.jpeg.gpsCoordinates", double[].class);

        public static final Key<Byte> GPS_PROCESSING_METHOD =

                new Key<Byte>("android.jpeg.gpsProcessingMethod", byte.class);

        public static final Key<String> GPS_PROCESSING_METHOD =

                new Key<String>("android.jpeg.gpsProcessingMethod", String.class);

        public static final Key<Long> GPS_TIMESTAMP =

                new Key<Long>("android.jpeg.gpsTimestamp", long.class);

        public static final Key<Integer> ORIENTATION =
@@ -500,8 +449,8 @@ public final class CaptureRequestKeys { 
                new Key<Byte>("android.jpeg.quality", byte.class);

        public static final Key<Byte> THUMBNAIL_QUALITY =

                new Key<Byte>("android.jpeg.thumbnailQuality", byte.class);

        public static final Key<int[]> THUMBNAIL_SIZE =

                new Key<int[]>("android.jpeg.thumbnailSize", int[].class);

        public static final Key<android.hardware.photography.Size> THUMBNAIL_SIZE =

                new Key<android.hardware.photography.Size>("android.jpeg.thumbnailSize", android.hardware.photography.Size.class);



    }
@@ -574,8 +523,8 @@ public final class CaptureRequestKeys { 
    }



    public static final class Scaler {

        public static final Key<int[]> CROP_REGION =

                new Key<int[]>("android.scaler.cropRegion", int[].class);

        public static final Key<android.graphics.Rect> CROP_REGION =

                new Key<android.graphics.Rect>("android.scaler.cropRegion", android.graphics.Rect.class);



    }
@@ -649,54 +598,17 @@ public final class CaptureRequestKeys { 
     * @hide

     */

    public static final class Led {



            /**

             * @hide

             */

            public static final class TransmitKey extends Key<Led.TransmitKey.Enum> {

                public enum Enum {

                    OFF,

                    ON;

                }



                public static final Enum OFF = Enum.OFF;

                public static final Enum ON = Enum.ON;



                // TODO: remove requirement for constructor by making Key an interface

                private TransmitKey(String name) {

                    super(name, Led.TransmitKey.Enum.class);

                }



            }



        /**

         * @hide

         */

        public static final Key<Led.TransmitKey.Enum> TRANSMIT =

                new TransmitKey("android.led.transmit");

        public static final Key<Boolean> TRANSMIT =

                new Key<Boolean>("android.led.transmit", boolean.class);



    }



    public static final class BlackLevel {



            public static final class LockKey extends Key<BlackLevel.LockKey.Enum> {

                public enum Enum {

                    OFF,

                    ON;

                }



                public static final Enum OFF = Enum.OFF;

                public static final Enum ON = Enum.ON;



                // TODO: remove requirement for constructor by making Key an interface

                private LockKey(String name) {

                    super(name, BlackLevel.LockKey.Enum.class);

                }



            }



        public static final Key<BlackLevel.LockKey.Enum> LOCK =

                new LockKey("android.blackLevel.lock");

        public static final Key<Boolean> LOCK =

                new Key<Boolean>("android.blackLevel.lock", boolean.class);



    }

core/java/android/hardware/photography/CaptureResultKeys.java

+12 −49
Original line number Diff line number Diff line
@@ -300,8 +300,8 @@ public final class CaptureResultKeys { 
    public static final class Jpeg {

        public static final Key<double[]> GPS_COORDINATES =

                new Key<double[]>("android.jpeg.gpsCoordinates", double[].class);

        public static final Key<Byte> GPS_PROCESSING_METHOD =

                new Key<Byte>("android.jpeg.gpsProcessingMethod", byte.class);

        public static final Key<String> GPS_PROCESSING_METHOD =

                new Key<String>("android.jpeg.gpsProcessingMethod", String.class);

        public static final Key<Long> GPS_TIMESTAMP =

                new Key<Long>("android.jpeg.gpsTimestamp", long.class);

        public static final Key<Integer> ORIENTATION =
@@ -310,8 +310,8 @@ public final class CaptureResultKeys { 
                new Key<Byte>("android.jpeg.quality", byte.class);

        public static final Key<Byte> THUMBNAIL_QUALITY =

                new Key<Byte>("android.jpeg.thumbnailQuality", byte.class);

        public static final Key<int[]> THUMBNAIL_SIZE =

                new Key<int[]>("android.jpeg.thumbnailSize", int[].class);

        public static final Key<android.hardware.photography.Size> THUMBNAIL_SIZE =

                new Key<android.hardware.photography.Size>("android.jpeg.thumbnailSize", android.hardware.photography.Size.class);



    }
@@ -402,8 +402,8 @@ public final class CaptureResultKeys { 
    }



    public static final class Scaler {

        public static final Key<int[]> CROP_REGION =

                new Key<int[]>("android.scaler.cropRegion", int[].class);

        public static final Key<android.graphics.Rect> CROP_REGION =

                new Key<android.graphics.Rect>("android.scaler.cropRegion", android.graphics.Rect.class);



    }
@@ -445,8 +445,8 @@ public final class CaptureResultKeys { 
                new Key<int[]>("android.statistics.faceIds", int[].class);

        public static final Key<int[]> FACE_LANDMARKS =

                new Key<int[]>("android.statistics.faceLandmarks", int[].class);

        public static final Key<int[]> FACE_RECTANGLES =

                new Key<int[]>("android.statistics.faceRectangles", int[].class);

        public static final Key<android.graphics.Rect[]> FACE_RECTANGLES =

                new Key<android.graphics.Rect[]>("android.statistics.faceRectangles", android.graphics.Rect[].class);

        public static final Key<byte[]> FACE_SCORES =

                new Key<byte[]>("android.statistics.faceScores", byte[].class);

        public static final Key<float[]> LENS_SHADING_MAP =
@@ -514,54 +514,17 @@ public final class CaptureResultKeys { 
     * @hide

     */

    public static final class Led {



        /**

         * @hide

         */

            public static final class TransmitKey extends Key<Led.TransmitKey.Enum> {

                public enum Enum {

                    OFF,

                    ON;

                }



                public static final Enum OFF = Enum.OFF;

                public static final Enum ON = Enum.ON;



                // TODO: remove requirement for constructor by making Key an interface

                private TransmitKey(String name) {

                    super(name, Led.TransmitKey.Enum.class);

                }



            }



        /**

         * @hide

         */

        public static final Key<Led.TransmitKey.Enum> TRANSMIT =

                new TransmitKey("android.led.transmit");

        public static final Key<Boolean> TRANSMIT =

                new Key<Boolean>("android.led.transmit", boolean.class);



    }



    public static final class BlackLevel {



            public static final class LockKey extends Key<BlackLevel.LockKey.Enum> {

                public enum Enum {

                    OFF,

                    ON;

                }



                public static final Enum OFF = Enum.OFF;

                public static final Enum ON = Enum.ON;



                // TODO: remove requirement for constructor by making Key an interface

                private LockKey(String name) {

                    super(name, BlackLevel.LockKey.Enum.class);

                }



            }



        public static final Key<BlackLevel.LockKey.Enum> LOCK =

                new LockKey("android.blackLevel.lock");

        public static final Key<Boolean> LOCK =

                new Key<Boolean>("android.blackLevel.lock", boolean.class);



    }