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

Commit 17a2579f authored by Shuzhen Wang's avatar Shuzhen Wang
Browse files

Camera: Filter readoutTimestamp for older vndk 

- readoutTimestamp was added in HAL version 3.8. Filter it for older vndk
versions.
- Renegerate the VNdkVersionMetdataTags by ordering them.

Test: Run VtsHalCameraServiceV2_0TargetTest on GSI build
Bug: 259932518
Bug: 259367770
Change-Id: I0aed8072ea3884a50c3874b352035a4c6efb4269
Merged-In: I0aed8072ea3884a50c3874b352035a4c6efb4269
parent 3d316f37

services/camera/libcameraservice/hidl/VndkVersionMetadataTags.h

+23 −22
Original line number Diff line number Diff line
@@ -31,47 +31,48 @@ 
std::map<int, std::vector<camera_metadata_tag>> static_api_level_to_keys{

      {30, {

          ANDROID_CONTROL_AVAILABLE_EXTENDED_SCENE_MODE_MAX_SIZES,

          ANDROID_CONTROL_AVAILABLE_EXTENDED_SCENE_MODE_ZOOM_RATIO_RANGES,

          ANDROID_CONTROL_ZOOM_RATIO_RANGE,

          ANDROID_SCALER_AVAILABLE_ROTATE_AND_CROP_MODES,

          ANDROID_CONTROL_AVAILABLE_EXTENDED_SCENE_MODE_ZOOM_RATIO_RANGES,

        } },

      {31, {

          ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION,

          ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION,

          ANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE_MAXIMUM_RESOLUTION,

          ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION,

          ANDROID_SCALER_AVAILABLE_INPUT_OUTPUT_FORMATS_MAP_MAXIMUM_RESOLUTION,

          ANDROID_SCALER_AVAILABLE_STALL_DURATIONS_MAXIMUM_RESOLUTION,

          ANDROID_HEIC_AVAILABLE_HEIC_STALL_DURATIONS_MAXIMUM_RESOLUTION,

          ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STALL_DURATIONS_MAXIMUM_RESOLUTION,

          ANDROID_CONTROL_AVAILABLE_HIGH_SPEED_VIDEO_CONFIGURATIONS_MAXIMUM_RESOLUTION,

          ANDROID_DEPTH_AVAILABLE_DEPTH_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION,

          ANDROID_DEPTH_AVAILABLE_DEPTH_STALL_DURATIONS_MAXIMUM_RESOLUTION,

          ANDROID_LENS_INTRINSIC_CALIBRATION_MAXIMUM_RESOLUTION,

          ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION,

          ANDROID_HEIC_AVAILABLE_HEIC_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION,

          ANDROID_SCALER_PHYSICAL_CAMERA_MULTI_RESOLUTION_STREAM_CONFIGURATIONS,

          ANDROID_DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION,

          ANDROID_SCALER_MULTI_RESOLUTION_STREAM_SUPPORTED,

          ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION,

          ANDROID_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION,

          ANDROID_DEPTH_AVAILABLE_DEPTH_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION,

          ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STALL_DURATIONS_MAXIMUM_RESOLUTION,

          ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION,

          ANDROID_HEIC_AVAILABLE_HEIC_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION,

          ANDROID_HEIC_AVAILABLE_HEIC_STALL_DURATIONS_MAXIMUM_RESOLUTION,

          ANDROID_HEIC_AVAILABLE_HEIC_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION,

          ANDROID_LENS_DISTORTION_MAXIMUM_RESOLUTION,

          ANDROID_LENS_INTRINSIC_CALIBRATION_MAXIMUM_RESOLUTION,

          ANDROID_SCALER_AVAILABLE_INPUT_OUTPUT_FORMATS_MAP_MAXIMUM_RESOLUTION,

          ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION,

          ANDROID_SCALER_AVAILABLE_STALL_DURATIONS_MAXIMUM_RESOLUTION,

          ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION,

          ANDROID_SCALER_DEFAULT_SECURE_IMAGE_SIZE,

          ANDROID_HEIC_AVAILABLE_HEIC_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION,

          ANDROID_SENSOR_OPAQUE_RAW_SIZE_MAXIMUM_RESOLUTION,

          ANDROID_SCALER_MULTI_RESOLUTION_STREAM_SUPPORTED,

          ANDROID_SCALER_PHYSICAL_CAMERA_MULTI_RESOLUTION_STREAM_CONFIGURATIONS,

          ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION,

          ANDROID_SENSOR_INFO_BINNING_FACTOR,

          ANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE_MAXIMUM_RESOLUTION,

          ANDROID_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION,

          ANDROID_SENSOR_OPAQUE_RAW_SIZE_MAXIMUM_RESOLUTION,

        } },

      {32, {

          ANDROID_INFO_DEVICE_STATE_ORIENTATIONS,

        } },

      {33, {

          ANDROID_FLASH_INFO_STRENGTH_DEFAULT_LEVEL,

          ANDROID_AUTOMOTIVE_LENS_FACING,

          ANDROID_AUTOMOTIVE_LOCATION,

          ANDROID_FLASH_INFO_STRENGTH_DEFAULT_LEVEL,

          ANDROID_FLASH_INFO_STRENGTH_MAXIMUM_LEVEL,

          ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP,

          ANDROID_REQUEST_RECOMMENDED_TEN_BIT_DYNAMIC_RANGE_PROFILE,

          ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES,

          ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP,

          ANDROID_FLASH_INFO_STRENGTH_MAXIMUM_LEVEL,

          ANDROID_SENSOR_READOUT_TIMESTAMP,

        } },

};
@@ -81,9 +82,9 @@ std::map<int, std::vector<camera_metadata_tag>> static_api_level_to_keys{ 
 */

std::map<int, std::vector<camera_metadata_tag>> dynamic_api_level_to_keys{

      {30, {

          ANDROID_CONTROL_EXTENDED_SCENE_MODE,

          ANDROID_CONTROL_ZOOM_RATIO,

          ANDROID_SCALER_ROTATE_AND_CROP,

          ANDROID_CONTROL_EXTENDED_SCENE_MODE,

        }  },

      {31, {

          ANDROID_SENSOR_PIXEL_MODE,