Update AIDL files accidentally diverged from HIDL / libcamera_metadata.

Bug: 222124945
Test: Built android.
Change-Id: Iadec82bdb792f00ba475e07b5b62b363c5f56586
This commit is contained in:
Austin Borger
2022-03-18 11:14:01 -07:00
parent 97347c1fa6
commit c31af39ecb
14 changed files with 54 additions and 52 deletions

View File

@@ -188,14 +188,15 @@ enum CameraMetadataTag {
ANDROID_SCALER_AVAILABLE_RECOMMENDED_STREAM_CONFIGURATIONS = 851982,
ANDROID_SCALER_AVAILABLE_RECOMMENDED_INPUT_OUTPUT_FORMATS_MAP = 851983,
ANDROID_SCALER_AVAILABLE_ROTATE_AND_CROP_MODES = 851984,
ANDROID_SCALER_DEFAULT_SECURE_IMAGE_SIZE = 851985,
ANDROID_SCALER_PHYSICAL_CAMERA_MULTI_RESOLUTION_STREAM_CONFIGURATIONS = 851986,
ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION = 851987,
ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION = 851988,
ANDROID_SCALER_AVAILABLE_STALL_DURATIONS_MAXIMUM_RESOLUTION = 851989,
ANDROID_SCALER_AVAILABLE_INPUT_OUTPUT_FORMATS_MAP_MAXIMUM_RESOLUTION = 851990,
ANDROID_SCALER_MULTI_RESOLUTION_STREAM_SUPPORTED = 851991,
ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES = 851992,
ANDROID_SCALER_ROTATE_AND_CROP = 851985,
ANDROID_SCALER_DEFAULT_SECURE_IMAGE_SIZE = 851986,
ANDROID_SCALER_PHYSICAL_CAMERA_MULTI_RESOLUTION_STREAM_CONFIGURATIONS = 851987,
ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION = 851988,
ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION = 851989,
ANDROID_SCALER_AVAILABLE_STALL_DURATIONS_MAXIMUM_RESOLUTION = 851990,
ANDROID_SCALER_AVAILABLE_INPUT_OUTPUT_FORMATS_MAP_MAXIMUM_RESOLUTION = 851991,
ANDROID_SCALER_MULTI_RESOLUTION_STREAM_SUPPORTED = 851992,
ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES = 851994,
ANDROID_SENSOR_EXPOSURE_TIME = 917504,
ANDROID_SENSOR_FRAME_DURATION = 917505,
ANDROID_SENSOR_SENSITIVITY = 917506,

View File

@@ -57,4 +57,5 @@ enum RequestAvailableCapabilities {
ANDROID_REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR = 16,
ANDROID_REQUEST_AVAILABLE_CAPABILITIES_REMOSAIC_REPROCESSING = 17,
ANDROID_REQUEST_AVAILABLE_CAPABILITIES_DYNAMIC_RANGE_TEN_BIT = 18,
ANDROID_REQUEST_AVAILABLE_CAPABILITIES_STREAM_USE_CASE = 19,
}

View File

@@ -43,6 +43,6 @@ enum SensorTestPatternMode {
ANDROID_SENSOR_TEST_PATTERN_MODE_COLOR_BARS = 2,
ANDROID_SENSOR_TEST_PATTERN_MODE_COLOR_BARS_FADE_TO_GRAY = 3,
ANDROID_SENSOR_TEST_PATTERN_MODE_PN9 = 4,
ANDROID_SENSOR_TEST_PATTERN_MODE_BLACK = 5,
ANDROID_SENSOR_TEST_PATTERN_MODE_CUSTOM1 = 256,
ANDROID_SENSOR_TEST_PATTERN_MODE_BLACK = 257,
}

View File

@@ -22,7 +22,8 @@
package android.hardware.camera.metadata;
/** android.automotive.lens.facing enumeration values
/**
* android.automotive.lens.facing enumeration values
* @see ANDROID_AUTOMOTIVE_LENS_FACING
*/
@VintfStability

View File

@@ -22,7 +22,8 @@
package android.hardware.camera.metadata;
/** android.automotive.location enumeration values
/**
* android.automotive.location enumeration values
* @see ANDROID_AUTOMOTIVE_LOCATION
*/
@VintfStability

View File

@@ -1160,6 +1160,13 @@ enum CameraMetadataTag {
* @see ANDROID_SCALER_ROTATE_AND_CROP
*/
ANDROID_SCALER_AVAILABLE_ROTATE_AND_CROP_MODES,
/**
* android.scaler.rotateAndCrop [dynamic, enum, public]
*
* <p>Whether a rotation-and-crop operation is applied to processed
* outputs from the camera.</p>
*/
ANDROID_SCALER_ROTATE_AND_CROP,
/**
* android.scaler.defaultSecureImageSize [static, int32[], public]
*
@@ -1229,7 +1236,7 @@ enum CameraMetadataTag {
*
* <p>The stream use cases supported by this camera device.</p>
*/
ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES,
ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES = 851994,
/**
* android.sensor.exposureTime [dynamic, int64, public]
*
@@ -2232,12 +2239,14 @@ enum CameraMetadataTag {
* <p>The maximum number of Jpeg APP segments supported by the camera HAL device.</p>
*/
ANDROID_HEIC_INFO_MAX_JPEG_APP_SEGMENTS_COUNT,
/** android.automotive.location [static, enum, public]
/**
* android.automotive.location [static, enum, public]
*
* <p>Location of the cameras on the automotive devices.</p>
*/
ANDROID_AUTOMOTIVE_LOCATION = CameraMetadataSectionStart.ANDROID_AUTOMOTIVE_START,
/** android.automotive.lens.facing [static, enum[], public]
/**
* android.automotive.lens.facing [static, enum[], public]
*
* <p>The direction of the camera faces relative to the vehicle body frame and the
* passenger seats.</p>

View File

@@ -22,10 +22,7 @@
package android.hardware.camera.metadata;
/*
* Enumeration definitions for the various entries that need them
*
*
/**
* android.colorCorrection.mode enumeration values
* @see ANDROID_COLOR_CORRECTION_MODE
*/

View File

@@ -22,11 +22,8 @@
package android.hardware.camera.metadata;
/*
* Enumeration definitions for the various entries that need them
*
*
* android.control.aeMode enumeration values added
/**
* android.control.aeMode enumeration values
* @see ANDROID_CONTROL_AE_MODE
*/
@VintfStability

View File

@@ -22,10 +22,7 @@
package android.hardware.camera.metadata;
/*
* Enumeration definitions for the various entries that need them
*
*
/**
* android.control.mode enumeration values
* @see ANDROID_CONTROL_MODE
*/

View File

@@ -22,10 +22,7 @@
package android.hardware.camera.metadata;
/*
* Enumeration definitions for the various entries that need them
*
*
/**
* android.control.videoStabilizationMode enumeration values
* @see ANDROID_CONTROL_VIDEO_STABILIZATION_MODE
*/

View File

@@ -48,4 +48,5 @@ enum RequestAvailableCapabilities {
ANDROID_REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR,
ANDROID_REQUEST_AVAILABLE_CAPABILITIES_REMOSAIC_REPROCESSING,
ANDROID_REQUEST_AVAILABLE_CAPABILITIES_DYNAMIC_RANGE_TEN_BIT,
ANDROID_REQUEST_AVAILABLE_CAPABILITIES_STREAM_USE_CASE,
}

View File

@@ -29,17 +29,17 @@ package android.hardware.camera.metadata;
@VintfStability
@Backing(type="long")
enum RequestAvailableDynamicRangeProfilesMap {
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_STANDARD = 0x1,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_HLG10 = 0x2,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_HDR10 = 0x4,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_HDR10_PLUS = 0x8,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_10B_HDR_REF = 0x10,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_10B_HDR_REF_PO = 0x20,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_10B_HDR_OEM = 0x40,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_10B_HDR_OEM_PO = 0x80,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_8B_HDR_REF = 0x100,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_8B_HDR_REF_PO = 0x200,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_8B_HDR_OEM = 0x400,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_8B_HDR_OEM_PO = 0x800,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_MAX = 0x1000,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_STANDARD = 0x1L,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_HLG10 = 0x2L,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_HDR10 = 0x4L,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_HDR10_PLUS = 0x8L,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_10B_HDR_REF = 0x10L,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_10B_HDR_REF_PO = 0x20L,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_10B_HDR_OEM = 0x40L,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_10B_HDR_OEM_PO = 0x80L,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_8B_HDR_REF = 0x100L,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_8B_HDR_REF_PO = 0x200L,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_8B_HDR_OEM = 0x400L,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_8B_HDR_OEM_PO = 0x800L,
ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_MAX = 0x1000L,
}

View File

@@ -29,11 +29,11 @@ package android.hardware.camera.metadata;
@VintfStability
@Backing(type="long")
enum ScalerAvailableStreamUseCases {
ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_DEFAULT = 0x0,
ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_PREVIEW = 0x1,
ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_STILL_CAPTURE = 0x2,
ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_VIDEO_RECORD = 0x3,
ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_PREVIEW_VIDEO_STILL = 0x4,
ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_VIDEO_CALL = 0x5,
ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_VENDOR_START = 0x10000,
ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_DEFAULT = 0x0L,
ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_PREVIEW = 0x1L,
ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_STILL_CAPTURE = 0x2L,
ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_VIDEO_RECORD = 0x3L,
ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_PREVIEW_VIDEO_STILL = 0x4L,
ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_VIDEO_CALL = 0x5L,
ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_VENDOR_START = 0x10000L,
}

View File

@@ -34,6 +34,6 @@ enum SensorTestPatternMode {
ANDROID_SENSOR_TEST_PATTERN_MODE_COLOR_BARS,
ANDROID_SENSOR_TEST_PATTERN_MODE_COLOR_BARS_FADE_TO_GRAY,
ANDROID_SENSOR_TEST_PATTERN_MODE_PN9,
ANDROID_SENSOR_TEST_PATTERN_MODE_CUSTOM1 = 256,
ANDROID_SENSOR_TEST_PATTERN_MODE_BLACK,
ANDROID_SENSOR_TEST_PATTERN_MODE_CUSTOM1 = 256,
}