{"id":13165,"url":"https://patchwork.libcamera.org/api/patches/13165/?format=json","web_url":"https://patchwork.libcamera.org/patch/13165/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210730103536.81117-8-paul.elder@ideasonboard.com>","date":"2021-07-30T10:35:34","name":"[libcamera-devel,v6,7/9] android: capabilities: Make keys list into set and member variable","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"55a619fc04ad48936d958f0b6718a584effcceb8","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13165/mbox/","series":[{"id":2291,"url":"https://patchwork.libcamera.org/api/series/2291/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2291","date":"2021-07-30T10:35:27","name":"android: Support capability and hardware level detection","version":6,"mbox":"https://patchwork.libcamera.org/series/2291/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13165/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13165/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 419C6C322E\n\tfor ;\n\tFri, 30 Jul 2021 10:36:03 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EBC10687C9;\n\tFri, 30 Jul 2021 12:36:02 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 193F2687C2\n\tfor ;\n\tFri, 30 Jul 2021 12:36:01 +0200 (CEST)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1383E89B;\n\tFri, 30 Jul 2021 12:35:58 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"AdboyrCz\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1627641360;\n\tbh=Wk7NbLU3IDLa2khiBoceUTmV+R5IjytMZOeXa+lLz9Q=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=AdboyrCzhAYUu+dLun/JRpHwXJUQ0PJj/y/pFke2F1tER9LSNnULjq3b3O2dtdNR3\n\thG5TGnDpsSX2ICCkdei7KaqThTk3LjDT5eOQZcr6X7t31ImTO8nN3GvIpQkIKkXs3y\n\tp5+oKbn3E6/D5PqKjy1WbwpcyHKbfxjrg4YY62dI=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 30 Jul 2021 19:35:34 +0900","Message-Id":"<20210730103536.81117-8-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20210730103536.81117-1-paul.elder@ideasonboard.com>","References":"<20210730103536.81117-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v6 7/9] android: capabilities: Make keys\n\tlist into set and member variable","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"We need to be able to add additional characteristics/request/result keys\ninto the corresponding list in the static metadata based on libcamera\ncamera capabilities. We also need to be able to easily check if the\nlists have specific keys, for populating templates and result metadata.\n\nTurn the characteristics, requests, and results keys vectors into sets,\nand move them to member variables to achieve this.\n\nSigned-off-by: Paul Elder \nReviewed-by: Jacopo Mondi \nReviewed-by: Laurent Pinchart \n---\n src/android/camera_capabilities.cpp | 266 ++++++++++++++--------------\n src/android/camera_capabilities.h | 5 +\n 2 files changed, 141 insertions(+), 130 deletions(-)","diff":"diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\nindex fa701843..20d1c99f 100644\n--- a/src/android/camera_capabilities.cpp\n+++ b/src/android/camera_capabilities.cpp\n@@ -655,6 +655,136 @@ int CameraCapabilities::initializeStaticMetadata()\n \tconst ControlInfoMap &controlsInfo = camera_->controls();\n \tconst ControlList &properties = camera_->properties();\n \n+\tavailableCharacteristicsKeys_ = {\n+\t\tANDROID_COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES,\n+\t\tANDROID_CONTROL_AE_AVAILABLE_ANTIBANDING_MODES,\n+\t\tANDROID_CONTROL_AE_AVAILABLE_MODES,\n+\t\tANDROID_CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES,\n+\t\tANDROID_CONTROL_AE_COMPENSATION_RANGE,\n+\t\tANDROID_CONTROL_AE_COMPENSATION_STEP,\n+\t\tANDROID_CONTROL_AE_LOCK_AVAILABLE,\n+\t\tANDROID_CONTROL_AF_AVAILABLE_MODES,\n+\t\tANDROID_CONTROL_AVAILABLE_EFFECTS,\n+\t\tANDROID_CONTROL_AVAILABLE_MODES,\n+\t\tANDROID_CONTROL_AVAILABLE_SCENE_MODES,\n+\t\tANDROID_CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES,\n+\t\tANDROID_CONTROL_AWB_AVAILABLE_MODES,\n+\t\tANDROID_CONTROL_AWB_LOCK_AVAILABLE,\n+\t\tANDROID_CONTROL_MAX_REGIONS,\n+\t\tANDROID_CONTROL_SCENE_MODE_OVERRIDES,\n+\t\tANDROID_FLASH_INFO_AVAILABLE,\n+\t\tANDROID_INFO_SUPPORTED_HARDWARE_LEVEL,\n+\t\tANDROID_JPEG_AVAILABLE_THUMBNAIL_SIZES,\n+\t\tANDROID_JPEG_MAX_SIZE,\n+\t\tANDROID_LENS_FACING,\n+\t\tANDROID_LENS_INFO_AVAILABLE_APERTURES,\n+\t\tANDROID_LENS_INFO_AVAILABLE_FOCAL_LENGTHS,\n+\t\tANDROID_LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION,\n+\t\tANDROID_LENS_INFO_HYPERFOCAL_DISTANCE,\n+\t\tANDROID_LENS_INFO_MINIMUM_FOCUS_DISTANCE,\n+\t\tANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES,\n+\t\tANDROID_REQUEST_AVAILABLE_CAPABILITIES,\n+\t\tANDROID_REQUEST_MAX_NUM_INPUT_STREAMS,\n+\t\tANDROID_REQUEST_MAX_NUM_OUTPUT_STREAMS,\n+\t\tANDROID_REQUEST_PARTIAL_RESULT_COUNT,\n+\t\tANDROID_REQUEST_PIPELINE_MAX_DEPTH,\n+\t\tANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM,\n+\t\tANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS,\n+\t\tANDROID_SCALER_AVAILABLE_STALL_DURATIONS,\n+\t\tANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS,\n+\t\tANDROID_SCALER_CROPPING_TYPE,\n+\t\tANDROID_SENSOR_AVAILABLE_TEST_PATTERN_MODES,\n+\t\tANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE,\n+\t\tANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT,\n+\t\tANDROID_SENSOR_INFO_EXPOSURE_TIME_RANGE,\n+\t\tANDROID_SENSOR_INFO_MAX_FRAME_DURATION,\n+\t\tANDROID_SENSOR_INFO_PHYSICAL_SIZE,\n+\t\tANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE,\n+\t\tANDROID_SENSOR_INFO_SENSITIVITY_RANGE,\n+\t\tANDROID_SENSOR_INFO_TIMESTAMP_SOURCE,\n+\t\tANDROID_SENSOR_ORIENTATION,\n+\t\tANDROID_STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES,\n+\t\tANDROID_STATISTICS_INFO_MAX_FACE_COUNT,\n+\t\tANDROID_SYNC_MAX_LATENCY,\n+\t};\n+\n+\tavailableRequestKeys_ = {\n+\t\tANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n+\t\tANDROID_CONTROL_AE_ANTIBANDING_MODE,\n+\t\tANDROID_CONTROL_AE_EXPOSURE_COMPENSATION,\n+\t\tANDROID_CONTROL_AE_LOCK,\n+\t\tANDROID_CONTROL_AE_MODE,\n+\t\tANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n+\t\tANDROID_CONTROL_AE_TARGET_FPS_RANGE,\n+\t\tANDROID_CONTROL_AF_MODE,\n+\t\tANDROID_CONTROL_AF_TRIGGER,\n+\t\tANDROID_CONTROL_AWB_LOCK,\n+\t\tANDROID_CONTROL_AWB_MODE,\n+\t\tANDROID_CONTROL_CAPTURE_INTENT,\n+\t\tANDROID_CONTROL_EFFECT_MODE,\n+\t\tANDROID_CONTROL_MODE,\n+\t\tANDROID_CONTROL_SCENE_MODE,\n+\t\tANDROID_CONTROL_VIDEO_STABILIZATION_MODE,\n+\t\tANDROID_FLASH_MODE,\n+\t\tANDROID_JPEG_ORIENTATION,\n+\t\tANDROID_JPEG_QUALITY,\n+\t\tANDROID_JPEG_THUMBNAIL_QUALITY,\n+\t\tANDROID_JPEG_THUMBNAIL_SIZE,\n+\t\tANDROID_LENS_APERTURE,\n+\t\tANDROID_LENS_OPTICAL_STABILIZATION_MODE,\n+\t\tANDROID_NOISE_REDUCTION_MODE,\n+\t\tANDROID_SCALER_CROP_REGION,\n+\t\tANDROID_STATISTICS_FACE_DETECT_MODE\n+\t};\n+\n+\tavailableResultKeys_ = {\n+\t\tANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n+\t\tANDROID_CONTROL_AE_ANTIBANDING_MODE,\n+\t\tANDROID_CONTROL_AE_EXPOSURE_COMPENSATION,\n+\t\tANDROID_CONTROL_AE_LOCK,\n+\t\tANDROID_CONTROL_AE_MODE,\n+\t\tANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n+\t\tANDROID_CONTROL_AE_STATE,\n+\t\tANDROID_CONTROL_AE_TARGET_FPS_RANGE,\n+\t\tANDROID_CONTROL_AF_MODE,\n+\t\tANDROID_CONTROL_AF_STATE,\n+\t\tANDROID_CONTROL_AF_TRIGGER,\n+\t\tANDROID_CONTROL_AWB_LOCK,\n+\t\tANDROID_CONTROL_AWB_MODE,\n+\t\tANDROID_CONTROL_AWB_STATE,\n+\t\tANDROID_CONTROL_CAPTURE_INTENT,\n+\t\tANDROID_CONTROL_EFFECT_MODE,\n+\t\tANDROID_CONTROL_MODE,\n+\t\tANDROID_CONTROL_SCENE_MODE,\n+\t\tANDROID_CONTROL_VIDEO_STABILIZATION_MODE,\n+\t\tANDROID_FLASH_MODE,\n+\t\tANDROID_FLASH_STATE,\n+\t\tANDROID_JPEG_GPS_COORDINATES,\n+\t\tANDROID_JPEG_GPS_PROCESSING_METHOD,\n+\t\tANDROID_JPEG_GPS_TIMESTAMP,\n+\t\tANDROID_JPEG_ORIENTATION,\n+\t\tANDROID_JPEG_QUALITY,\n+\t\tANDROID_JPEG_SIZE,\n+\t\tANDROID_JPEG_THUMBNAIL_QUALITY,\n+\t\tANDROID_JPEG_THUMBNAIL_SIZE,\n+\t\tANDROID_LENS_APERTURE,\n+\t\tANDROID_LENS_FOCAL_LENGTH,\n+\t\tANDROID_LENS_OPTICAL_STABILIZATION_MODE,\n+\t\tANDROID_LENS_STATE,\n+\t\tANDROID_NOISE_REDUCTION_MODE,\n+\t\tANDROID_REQUEST_PIPELINE_DEPTH,\n+\t\tANDROID_SCALER_CROP_REGION,\n+\t\tANDROID_SENSOR_EXPOSURE_TIME,\n+\t\tANDROID_SENSOR_FRAME_DURATION,\n+\t\tANDROID_SENSOR_ROLLING_SHUTTER_SKEW,\n+\t\tANDROID_SENSOR_TEST_PATTERN_MODE,\n+\t\tANDROID_SENSOR_TIMESTAMP,\n+\t\tANDROID_STATISTICS_FACE_DETECT_MODE,\n+\t\tANDROID_STATISTICS_LENS_SHADING_MAP_MODE,\n+\t\tANDROID_STATISTICS_HOT_PIXEL_MAP_MODE,\n+\t\tANDROID_STATISTICS_SCENE_FLICKER,\n+\t};\n+\n \t/* Color correction static metadata. */\n \t{\n \t\tstd::vector data;\n@@ -1152,141 +1282,17 @@ int CameraCapabilities::initializeStaticMetadata()\n \t\t<< \"Hardware level: \"\n \t\t<< hwLevelStrings.find(hwLevel_)->second;\n \n-\tstd::vector availableCharacteristicsKeys = {\n-\t\tANDROID_COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES,\n-\t\tANDROID_CONTROL_AE_AVAILABLE_ANTIBANDING_MODES,\n-\t\tANDROID_CONTROL_AE_AVAILABLE_MODES,\n-\t\tANDROID_CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES,\n-\t\tANDROID_CONTROL_AE_COMPENSATION_RANGE,\n-\t\tANDROID_CONTROL_AE_COMPENSATION_STEP,\n-\t\tANDROID_CONTROL_AE_LOCK_AVAILABLE,\n-\t\tANDROID_CONTROL_AF_AVAILABLE_MODES,\n-\t\tANDROID_CONTROL_AVAILABLE_EFFECTS,\n-\t\tANDROID_CONTROL_AVAILABLE_MODES,\n-\t\tANDROID_CONTROL_AVAILABLE_SCENE_MODES,\n-\t\tANDROID_CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES,\n-\t\tANDROID_CONTROL_AWB_AVAILABLE_MODES,\n-\t\tANDROID_CONTROL_AWB_LOCK_AVAILABLE,\n-\t\tANDROID_CONTROL_MAX_REGIONS,\n-\t\tANDROID_CONTROL_SCENE_MODE_OVERRIDES,\n-\t\tANDROID_FLASH_INFO_AVAILABLE,\n-\t\tANDROID_INFO_SUPPORTED_HARDWARE_LEVEL,\n-\t\tANDROID_JPEG_AVAILABLE_THUMBNAIL_SIZES,\n-\t\tANDROID_JPEG_MAX_SIZE,\n-\t\tANDROID_LENS_FACING,\n-\t\tANDROID_LENS_INFO_AVAILABLE_APERTURES,\n-\t\tANDROID_LENS_INFO_AVAILABLE_FOCAL_LENGTHS,\n-\t\tANDROID_LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION,\n-\t\tANDROID_LENS_INFO_HYPERFOCAL_DISTANCE,\n-\t\tANDROID_LENS_INFO_MINIMUM_FOCUS_DISTANCE,\n-\t\tANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES,\n-\t\tANDROID_REQUEST_AVAILABLE_CAPABILITIES,\n-\t\tANDROID_REQUEST_MAX_NUM_INPUT_STREAMS,\n-\t\tANDROID_REQUEST_MAX_NUM_OUTPUT_STREAMS,\n-\t\tANDROID_REQUEST_PARTIAL_RESULT_COUNT,\n-\t\tANDROID_REQUEST_PIPELINE_MAX_DEPTH,\n-\t\tANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM,\n-\t\tANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS,\n-\t\tANDROID_SCALER_AVAILABLE_STALL_DURATIONS,\n-\t\tANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS,\n-\t\tANDROID_SCALER_CROPPING_TYPE,\n-\t\tANDROID_SENSOR_AVAILABLE_TEST_PATTERN_MODES,\n-\t\tANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE,\n-\t\tANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT,\n-\t\tANDROID_SENSOR_INFO_EXPOSURE_TIME_RANGE,\n-\t\tANDROID_SENSOR_INFO_MAX_FRAME_DURATION,\n-\t\tANDROID_SENSOR_INFO_PHYSICAL_SIZE,\n-\t\tANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE,\n-\t\tANDROID_SENSOR_INFO_SENSITIVITY_RANGE,\n-\t\tANDROID_SENSOR_INFO_TIMESTAMP_SOURCE,\n-\t\tANDROID_SENSOR_ORIENTATION,\n-\t\tANDROID_STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES,\n-\t\tANDROID_STATISTICS_INFO_MAX_FACE_COUNT,\n-\t\tANDROID_SYNC_MAX_LATENCY,\n-\t};\n \tstaticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_CHARACTERISTICS_KEYS,\n-\t\t\t\t availableCharacteristicsKeys);\n+\t\t\t\t std::vector(availableCharacteristicsKeys_.begin(),\n+\t\t\t\t\t\t availableCharacteristicsKeys_.end()));\n \n-\tstd::vector availableRequestKeys = {\n-\t\tANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n-\t\tANDROID_CONTROL_AE_ANTIBANDING_MODE,\n-\t\tANDROID_CONTROL_AE_EXPOSURE_COMPENSATION,\n-\t\tANDROID_CONTROL_AE_LOCK,\n-\t\tANDROID_CONTROL_AE_MODE,\n-\t\tANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n-\t\tANDROID_CONTROL_AE_TARGET_FPS_RANGE,\n-\t\tANDROID_CONTROL_AF_MODE,\n-\t\tANDROID_CONTROL_AF_TRIGGER,\n-\t\tANDROID_CONTROL_AWB_LOCK,\n-\t\tANDROID_CONTROL_AWB_MODE,\n-\t\tANDROID_CONTROL_CAPTURE_INTENT,\n-\t\tANDROID_CONTROL_EFFECT_MODE,\n-\t\tANDROID_CONTROL_MODE,\n-\t\tANDROID_CONTROL_SCENE_MODE,\n-\t\tANDROID_CONTROL_VIDEO_STABILIZATION_MODE,\n-\t\tANDROID_FLASH_MODE,\n-\t\tANDROID_JPEG_ORIENTATION,\n-\t\tANDROID_JPEG_QUALITY,\n-\t\tANDROID_JPEG_THUMBNAIL_QUALITY,\n-\t\tANDROID_JPEG_THUMBNAIL_SIZE,\n-\t\tANDROID_LENS_APERTURE,\n-\t\tANDROID_LENS_OPTICAL_STABILIZATION_MODE,\n-\t\tANDROID_NOISE_REDUCTION_MODE,\n-\t\tANDROID_SCALER_CROP_REGION,\n-\t\tANDROID_STATISTICS_FACE_DETECT_MODE\n-\t};\n \tstaticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_REQUEST_KEYS,\n-\t\t\t\t availableRequestKeys);\n+\t\t\t\t std::vector(availableRequestKeys_.begin(),\n+\t\t\t\t\t\t availableRequestKeys_.end()));\n \n-\tstd::vector availableResultKeys = {\n-\t\tANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n-\t\tANDROID_CONTROL_AE_ANTIBANDING_MODE,\n-\t\tANDROID_CONTROL_AE_EXPOSURE_COMPENSATION,\n-\t\tANDROID_CONTROL_AE_LOCK,\n-\t\tANDROID_CONTROL_AE_MODE,\n-\t\tANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n-\t\tANDROID_CONTROL_AE_STATE,\n-\t\tANDROID_CONTROL_AE_TARGET_FPS_RANGE,\n-\t\tANDROID_CONTROL_AF_MODE,\n-\t\tANDROID_CONTROL_AF_STATE,\n-\t\tANDROID_CONTROL_AF_TRIGGER,\n-\t\tANDROID_CONTROL_AWB_LOCK,\n-\t\tANDROID_CONTROL_AWB_MODE,\n-\t\tANDROID_CONTROL_AWB_STATE,\n-\t\tANDROID_CONTROL_CAPTURE_INTENT,\n-\t\tANDROID_CONTROL_EFFECT_MODE,\n-\t\tANDROID_CONTROL_MODE,\n-\t\tANDROID_CONTROL_SCENE_MODE,\n-\t\tANDROID_CONTROL_VIDEO_STABILIZATION_MODE,\n-\t\tANDROID_FLASH_MODE,\n-\t\tANDROID_FLASH_STATE,\n-\t\tANDROID_JPEG_GPS_COORDINATES,\n-\t\tANDROID_JPEG_GPS_PROCESSING_METHOD,\n-\t\tANDROID_JPEG_GPS_TIMESTAMP,\n-\t\tANDROID_JPEG_ORIENTATION,\n-\t\tANDROID_JPEG_QUALITY,\n-\t\tANDROID_JPEG_SIZE,\n-\t\tANDROID_JPEG_THUMBNAIL_QUALITY,\n-\t\tANDROID_JPEG_THUMBNAIL_SIZE,\n-\t\tANDROID_LENS_APERTURE,\n-\t\tANDROID_LENS_FOCAL_LENGTH,\n-\t\tANDROID_LENS_OPTICAL_STABILIZATION_MODE,\n-\t\tANDROID_LENS_STATE,\n-\t\tANDROID_NOISE_REDUCTION_MODE,\n-\t\tANDROID_REQUEST_PIPELINE_DEPTH,\n-\t\tANDROID_SCALER_CROP_REGION,\n-\t\tANDROID_SENSOR_EXPOSURE_TIME,\n-\t\tANDROID_SENSOR_FRAME_DURATION,\n-\t\tANDROID_SENSOR_ROLLING_SHUTTER_SKEW,\n-\t\tANDROID_SENSOR_TEST_PATTERN_MODE,\n-\t\tANDROID_SENSOR_TIMESTAMP,\n-\t\tANDROID_STATISTICS_FACE_DETECT_MODE,\n-\t\tANDROID_STATISTICS_LENS_SHADING_MAP_MODE,\n-\t\tANDROID_STATISTICS_HOT_PIXEL_MAP_MODE,\n-\t\tANDROID_STATISTICS_SCENE_FLICKER,\n-\t};\n \tstaticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_RESULT_KEYS,\n-\t\t\t\t availableResultKeys);\n+\t\t\t\t std::vector(availableResultKeys_.begin(),\n+\t\t\t\t\t\t availableResultKeys_.end()));\n \n \tif (!staticMetadata_->isValid()) {\n \t\tLOG(HAL, Error) << \"Failed to construct static metadata\";\ndiff --git a/src/android/camera_capabilities.h b/src/android/camera_capabilities.h\nindex c7a966ce..dc5339c1 100644\n--- a/src/android/camera_capabilities.h\n+++ b/src/android/camera_capabilities.h\n@@ -9,6 +9,7 @@\n \n #include \n #include \n+#include \n #include \n \n #include \n@@ -72,6 +73,10 @@ private:\n \tstd::map formatsMap_;\n \tstd::unique_ptr staticMetadata_;\n \tunsigned int maxJpegBufferSize_;\n+\n+\tstd::set availableCharacteristicsKeys_;\n+\tstd::set availableRequestKeys_;\n+\tstd::set availableResultKeys_;\n };\n \n #endif /* __ANDROID_CAMERA_CAPABILITIES_H__ */\n","prefixes":["libcamera-devel","v6","7/9"]}