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

Commit d76db8d1 authored by Austin Borger's avatar Austin Borger Committed by Android (Google) Code Review
Browse files

Merge "Camera AIDL: Remove unsupported color space enums." into udc-dev

parents fd0e4b68 cf9118c2

camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/AutomotiveLensFacing.aidl

+15 −15
Original line number Diff line number Diff line
@@ -38,19 +38,19 @@ 
package android.hardware.camera.metadata;

@Backing(type="int") @VintfStability

enum AutomotiveLensFacing {

  ANDROID_AUTOMOTIVE_LENS_FACING_EXTERIOR_OTHER = 0,

  ANDROID_AUTOMOTIVE_LENS_FACING_EXTERIOR_FRONT = 1,

  ANDROID_AUTOMOTIVE_LENS_FACING_EXTERIOR_REAR = 2,

  ANDROID_AUTOMOTIVE_LENS_FACING_EXTERIOR_LEFT = 3,

  ANDROID_AUTOMOTIVE_LENS_FACING_EXTERIOR_RIGHT = 4,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_OTHER = 5,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_1_LEFT = 6,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_1_CENTER = 7,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_1_RIGHT = 8,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_2_LEFT = 9,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_2_CENTER = 10,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_2_RIGHT = 11,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_3_LEFT = 12,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_3_CENTER = 13,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_3_RIGHT = 14,

  ANDROID_AUTOMOTIVE_LENS_FACING_EXTERIOR_OTHER,

  ANDROID_AUTOMOTIVE_LENS_FACING_EXTERIOR_FRONT,

  ANDROID_AUTOMOTIVE_LENS_FACING_EXTERIOR_REAR,

  ANDROID_AUTOMOTIVE_LENS_FACING_EXTERIOR_LEFT,

  ANDROID_AUTOMOTIVE_LENS_FACING_EXTERIOR_RIGHT,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_OTHER,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_1_LEFT,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_1_CENTER,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_1_RIGHT,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_2_LEFT,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_2_CENTER,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_2_RIGHT,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_3_LEFT,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_3_CENTER,

  ANDROID_AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_3_RIGHT,

}

camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/AutomotiveLocation.aidl

+11 −11
Original line number Diff line number Diff line
@@ -38,15 +38,15 @@ 
package android.hardware.camera.metadata;

@Backing(type="int") @VintfStability

enum AutomotiveLocation {

  ANDROID_AUTOMOTIVE_LOCATION_INTERIOR = 0,

  ANDROID_AUTOMOTIVE_LOCATION_EXTERIOR_OTHER = 1,

  ANDROID_AUTOMOTIVE_LOCATION_EXTERIOR_FRONT = 2,

  ANDROID_AUTOMOTIVE_LOCATION_EXTERIOR_REAR = 3,

  ANDROID_AUTOMOTIVE_LOCATION_EXTERIOR_LEFT = 4,

  ANDROID_AUTOMOTIVE_LOCATION_EXTERIOR_RIGHT = 5,

  ANDROID_AUTOMOTIVE_LOCATION_EXTRA_OTHER = 6,

  ANDROID_AUTOMOTIVE_LOCATION_EXTRA_FRONT = 7,

  ANDROID_AUTOMOTIVE_LOCATION_EXTRA_REAR = 8,

  ANDROID_AUTOMOTIVE_LOCATION_EXTRA_LEFT = 9,

  ANDROID_AUTOMOTIVE_LOCATION_EXTRA_RIGHT = 10,

  ANDROID_AUTOMOTIVE_LOCATION_INTERIOR,

  ANDROID_AUTOMOTIVE_LOCATION_EXTERIOR_OTHER,

  ANDROID_AUTOMOTIVE_LOCATION_EXTERIOR_FRONT,

  ANDROID_AUTOMOTIVE_LOCATION_EXTERIOR_REAR,

  ANDROID_AUTOMOTIVE_LOCATION_EXTERIOR_LEFT,

  ANDROID_AUTOMOTIVE_LOCATION_EXTERIOR_RIGHT,

  ANDROID_AUTOMOTIVE_LOCATION_EXTRA_OTHER,

  ANDROID_AUTOMOTIVE_LOCATION_EXTRA_FRONT,

  ANDROID_AUTOMOTIVE_LOCATION_EXTRA_REAR,

  ANDROID_AUTOMOTIVE_LOCATION_EXTRA_LEFT,

  ANDROID_AUTOMOTIVE_LOCATION_EXTRA_RIGHT,

}

camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/BlackLevelLock.aidl

+2 −2
Original line number Diff line number Diff line
@@ -38,6 +38,6 @@ 
package android.hardware.camera.metadata;

@Backing(type="int") @VintfStability

enum BlackLevelLock {

  ANDROID_BLACK_LEVEL_LOCK_OFF = 0,

  ANDROID_BLACK_LEVEL_LOCK_ON = 1,

  ANDROID_BLACK_LEVEL_LOCK_OFF,

  ANDROID_BLACK_LEVEL_LOCK_ON,

}

camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/CameraMetadataSection.aidl

+35 −35
Original line number Diff line number Diff line
@@ -38,39 +38,39 @@ 
package android.hardware.camera.metadata;

@Backing(type="int") @VintfStability

enum CameraMetadataSection {

  ANDROID_COLOR_CORRECTION = 0,

  ANDROID_CONTROL = 1,

  ANDROID_DEMOSAIC = 2,

  ANDROID_EDGE = 3,

  ANDROID_FLASH = 4,

  ANDROID_FLASH_INFO = 5,

  ANDROID_HOT_PIXEL = 6,

  ANDROID_JPEG = 7,

  ANDROID_LENS = 8,

  ANDROID_LENS_INFO = 9,

  ANDROID_NOISE_REDUCTION = 10,

  ANDROID_QUIRKS = 11,

  ANDROID_REQUEST = 12,

  ANDROID_SCALER = 13,

  ANDROID_SENSOR = 14,

  ANDROID_SENSOR_INFO = 15,

  ANDROID_SHADING = 16,

  ANDROID_STATISTICS = 17,

  ANDROID_STATISTICS_INFO = 18,

  ANDROID_TONEMAP = 19,

  ANDROID_LED = 20,

  ANDROID_INFO = 21,

  ANDROID_BLACK_LEVEL = 22,

  ANDROID_SYNC = 23,

  ANDROID_REPROCESS = 24,

  ANDROID_DEPTH = 25,

  ANDROID_LOGICAL_MULTI_CAMERA = 26,

  ANDROID_DISTORTION_CORRECTION = 27,

  ANDROID_HEIC = 28,

  ANDROID_HEIC_INFO = 29,

  ANDROID_AUTOMOTIVE = 30,

  ANDROID_AUTOMOTIVE_LENS = 31,

  ANDROID_EXTENSION = 32,

  ANDROID_JPEGR = 33,

  VENDOR_SECTION = 32768,

  ANDROID_COLOR_CORRECTION,

  ANDROID_CONTROL,

  ANDROID_DEMOSAIC,

  ANDROID_EDGE,

  ANDROID_FLASH,

  ANDROID_FLASH_INFO,

  ANDROID_HOT_PIXEL,

  ANDROID_JPEG,

  ANDROID_LENS,

  ANDROID_LENS_INFO,

  ANDROID_NOISE_REDUCTION,

  ANDROID_QUIRKS,

  ANDROID_REQUEST,

  ANDROID_SCALER,

  ANDROID_SENSOR,

  ANDROID_SENSOR_INFO,

  ANDROID_SHADING,

  ANDROID_STATISTICS,

  ANDROID_STATISTICS_INFO,

  ANDROID_TONEMAP,

  ANDROID_LED,

  ANDROID_INFO,

  ANDROID_BLACK_LEVEL,

  ANDROID_SYNC,

  ANDROID_REPROCESS,

  ANDROID_DEPTH,

  ANDROID_LOGICAL_MULTI_CAMERA,

  ANDROID_DISTORTION_CORRECTION,

  ANDROID_HEIC,

  ANDROID_HEIC_INFO,

  ANDROID_AUTOMOTIVE,

  ANDROID_AUTOMOTIVE_LENS,

  ANDROID_EXTENSION,

  ANDROID_JPEGR,

  VENDOR_SECTION = 0x8000,

}

camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/CameraMetadataSectionStart.aidl

+35 −35
Original line number Diff line number Diff line
@@ -38,39 +38,39 @@ 
package android.hardware.camera.metadata;

@Backing(type="int") @VintfStability

enum CameraMetadataSectionStart {

  ANDROID_COLOR_CORRECTION_START = 0,

  ANDROID_CONTROL_START = 65536,

  ANDROID_DEMOSAIC_START = 131072,

  ANDROID_EDGE_START = 196608,

  ANDROID_FLASH_START = 262144,

  ANDROID_FLASH_INFO_START = 327680,

  ANDROID_HOT_PIXEL_START = 393216,

  ANDROID_JPEG_START = 458752,

  ANDROID_LENS_START = 524288,

  ANDROID_LENS_INFO_START = 589824,

  ANDROID_NOISE_REDUCTION_START = 655360,

  ANDROID_QUIRKS_START = 720896,

  ANDROID_REQUEST_START = 786432,

  ANDROID_SCALER_START = 851968,

  ANDROID_SENSOR_START = 917504,

  ANDROID_SENSOR_INFO_START = 983040,

  ANDROID_SHADING_START = 1048576,

  ANDROID_STATISTICS_START = 1114112,

  ANDROID_STATISTICS_INFO_START = 1179648,

  ANDROID_TONEMAP_START = 1245184,

  ANDROID_LED_START = 1310720,

  ANDROID_INFO_START = 1376256,

  ANDROID_BLACK_LEVEL_START = 1441792,

  ANDROID_SYNC_START = 1507328,

  ANDROID_REPROCESS_START = 1572864,

  ANDROID_DEPTH_START = 1638400,

  ANDROID_LOGICAL_MULTI_CAMERA_START = 1703936,

  ANDROID_DISTORTION_CORRECTION_START = 1769472,

  ANDROID_HEIC_START = 1835008,

  ANDROID_HEIC_INFO_START = 1900544,

  ANDROID_AUTOMOTIVE_START = 1966080,

  ANDROID_AUTOMOTIVE_LENS_START = 2031616,

  ANDROID_EXTENSION_START = 2097152,

  ANDROID_JPEGR_START = 2162688,

  VENDOR_SECTION_START = -2147483648,

  ANDROID_COLOR_CORRECTION_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_COLOR_CORRECTION << 16) /* 0 */,

  ANDROID_CONTROL_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_CONTROL << 16) /* 65536 */,

  ANDROID_DEMOSAIC_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_DEMOSAIC << 16) /* 131072 */,

  ANDROID_EDGE_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_EDGE << 16) /* 196608 */,

  ANDROID_FLASH_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_FLASH << 16) /* 262144 */,

  ANDROID_FLASH_INFO_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_FLASH_INFO << 16) /* 327680 */,

  ANDROID_HOT_PIXEL_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_HOT_PIXEL << 16) /* 393216 */,

  ANDROID_JPEG_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_JPEG << 16) /* 458752 */,

  ANDROID_LENS_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_LENS << 16) /* 524288 */,

  ANDROID_LENS_INFO_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_LENS_INFO << 16) /* 589824 */,

  ANDROID_NOISE_REDUCTION_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_NOISE_REDUCTION << 16) /* 655360 */,

  ANDROID_QUIRKS_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_QUIRKS << 16) /* 720896 */,

  ANDROID_REQUEST_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_REQUEST << 16) /* 786432 */,

  ANDROID_SCALER_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_SCALER << 16) /* 851968 */,

  ANDROID_SENSOR_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_SENSOR << 16) /* 917504 */,

  ANDROID_SENSOR_INFO_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_SENSOR_INFO << 16) /* 983040 */,

  ANDROID_SHADING_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_SHADING << 16) /* 1048576 */,

  ANDROID_STATISTICS_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_STATISTICS << 16) /* 1114112 */,

  ANDROID_STATISTICS_INFO_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_STATISTICS_INFO << 16) /* 1179648 */,

  ANDROID_TONEMAP_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_TONEMAP << 16) /* 1245184 */,

  ANDROID_LED_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_LED << 16) /* 1310720 */,

  ANDROID_INFO_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_INFO << 16) /* 1376256 */,

  ANDROID_BLACK_LEVEL_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_BLACK_LEVEL << 16) /* 1441792 */,

  ANDROID_SYNC_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_SYNC << 16) /* 1507328 */,

  ANDROID_REPROCESS_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_REPROCESS << 16) /* 1572864 */,

  ANDROID_DEPTH_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_DEPTH << 16) /* 1638400 */,

  ANDROID_LOGICAL_MULTI_CAMERA_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_LOGICAL_MULTI_CAMERA << 16) /* 1703936 */,

  ANDROID_DISTORTION_CORRECTION_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_DISTORTION_CORRECTION << 16) /* 1769472 */,

  ANDROID_HEIC_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_HEIC << 16) /* 1835008 */,

  ANDROID_HEIC_INFO_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_HEIC_INFO << 16) /* 1900544 */,

  ANDROID_AUTOMOTIVE_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_AUTOMOTIVE << 16) /* 1966080 */,

  ANDROID_AUTOMOTIVE_LENS_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_AUTOMOTIVE_LENS << 16) /* 2031616 */,

  ANDROID_EXTENSION_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_EXTENSION << 16) /* 2097152 */,

  ANDROID_JPEGR_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_JPEGR << 16) /* 2162688 */,

  VENDOR_SECTION_START = (android.hardware.camera.metadata.CameraMetadataSection.VENDOR_SECTION << 16) /* -2147483648 */,

}