{"id":1941,"url":"https://patchwork.libcamera.org/api/patches/1941/?format=json","web_url":"https://patchwork.libcamera.org/patch/1941/","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":"<20190905074737.6955-10-jacopo@jmondi.org>","date":"2019-09-05T07:47:36","name":"[libcamera-devel,v6,9/9] android: camera_device: Report available keys","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"8051915918b7bf81f296ea6608e53b4ede8a3834","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1941/mbox/","series":[{"id":481,"url":"https://patchwork.libcamera.org/api/series/481/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=481","date":"2019-09-05T07:47:27","name":"android: Rework metadata tags","version":6,"mbox":"https://patchwork.libcamera.org/series/481/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1941/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1941/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net\n\t[217.70.183.196])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6932061927\n\tfor ;\n\tThu, 5 Sep 2019 09:46:19 +0200 (CEST)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 9D9DDE000A;\n\tThu, 5 Sep 2019 07:46:18 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 5 Sep 2019 09:47:36 +0200","Message-Id":"<20190905074737.6955-10-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.23.0","In-Reply-To":"<20190905074737.6955-1-jacopo@jmondi.org>","References":"<20190905074737.6955-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v6 9/9] android: camera_device: Report\n\tavailable keys","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 05 Sep 2019 07:46:19 -0000"},"content":"Report the list of available static metadata tags (characteristicKeys),\nof supported controls (requestKeys) and produced metadata (resultKeys)\nin the static metadata pack.\n\nReviewed-by: Laurent Pinchart \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 93 ++++++++++++++++++++++++++++++++++-\n 1 file changed, 91 insertions(+), 2 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex cc90a8b216e6..2bef4a8e0288 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -125,9 +125,9 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \n \t/*\n \t * \\todo Keep this in sync with the actual number of entries.\n-\t * Currently: 46 entries, 390 bytes\n+\t * Currently: 49 entries, 666 bytes\n \t */\n-\tstaticMetadata_ = new CameraMetadata(50, 500);\n+\tstaticMetadata_ = new CameraMetadata(50, 700);\n \tif (!staticMetadata_->isValid()) {\n \t\tLOG(HAL, Error) << \"Failed to allocate static metadata\";\n \t\tdelete staticMetadata_;\n@@ -425,6 +425,95 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\t\t\t availableCapabilities.data(),\n \t\t\t\t availableCapabilities.size());\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_AF_AVAILABLE_MODES,\n+\t\tANDROID_CONTROL_AVAILABLE_EFFECTS,\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_MAX_REGIONS,\n+\t\tANDROID_CONTROL_SCENE_MODE_OVERRIDES,\n+\t\tANDROID_CONTROL_AE_LOCK_AVAILABLE,\n+\t\tANDROID_CONTROL_AWB_LOCK_AVAILABLE,\n+\t\tANDROID_CONTROL_AVAILABLE_MODES,\n+\t\tANDROID_JPEG_AVAILABLE_THUMBNAIL_SIZES,\n+\t\tANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE,\n+\t\tANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE,\n+\t\tANDROID_SENSOR_INFO_SENSITIVITY_RANGE,\n+\t\tANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT,\n+\t\tANDROID_SENSOR_INFO_EXPOSURE_TIME_RANGE,\n+\t\tANDROID_SENSOR_ORIENTATION,\n+\t\tANDROID_SENSOR_AVAILABLE_TEST_PATTERN_MODES,\n+\t\tANDROID_SENSOR_INFO_PHYSICAL_SIZE,\n+\t\tANDROID_SENSOR_INFO_TIMESTAMP_SOURCE,\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\tANDROID_FLASH_INFO_AVAILABLE,\n+\t\tANDROID_LENS_INFO_AVAILABLE_APERTURES,\n+\t\tANDROID_LENS_FACING,\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_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM,\n+\t\tANDROID_SCALER_AVAILABLE_FORMATS,\n+\t\tANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS,\n+\t\tANDROID_SCALER_AVAILABLE_STALL_DURATIONS,\n+\t\tANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS,\n+\t\tANDROID_SCALER_CROPPING_TYPE,\n+\t\tANDROID_INFO_SUPPORTED_HARDWARE_LEVEL,\n+\t\tANDROID_REQUEST_PARTIAL_RESULT_COUNT,\n+\t\tANDROID_REQUEST_PIPELINE_MAX_DEPTH,\n+\t\tANDROID_REQUEST_AVAILABLE_CAPABILITIES,\n+\t};\n+\tstaticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_CHARACTERISTICS_KEYS,\n+\t\t\t\t availableCharacteristicsKeys.data(),\n+\t\t\t\t availableCharacteristicsKeys.size());\n+\n+\tstd::vector availableRequestKeys = {\n+\t\tANDROID_CONTROL_AE_MODE,\n+\t\tANDROID_CONTROL_AE_EXPOSURE_COMPENSATION,\n+\t\tANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n+\t\tANDROID_CONTROL_AE_LOCK,\n+\t\tANDROID_CONTROL_AF_TRIGGER,\n+\t\tANDROID_CONTROL_AWB_MODE,\n+\t\tANDROID_CONTROL_AWB_LOCK,\n+\t\tANDROID_FLASH_MODE,\n+\t\tANDROID_STATISTICS_FACE_DETECT_MODE,\n+\t\tANDROID_NOISE_REDUCTION_MODE,\n+\t\tANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n+\t\tANDROID_CONTROL_CAPTURE_INTENT,\n+\t};\n+\tstaticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_REQUEST_KEYS,\n+\t\t\t\t availableRequestKeys.data(),\n+\t\t\t\t availableRequestKeys.size());\n+\n+\tstd::vector availableResultKeys = {\n+\t\tANDROID_CONTROL_AE_STATE,\n+\t\tANDROID_CONTROL_AE_LOCK,\n+\t\tANDROID_CONTROL_AF_STATE,\n+\t\tANDROID_CONTROL_AWB_STATE,\n+\t\tANDROID_CONTROL_AWB_LOCK,\n+\t\tANDROID_LENS_STATE,\n+\t\tANDROID_SCALER_CROP_REGION,\n+\t\tANDROID_SENSOR_TIMESTAMP,\n+\t\tANDROID_SENSOR_ROLLING_SHUTTER_SKEW,\n+\t\tANDROID_SENSOR_EXPOSURE_TIME,\n+\t\tANDROID_STATISTICS_LENS_SHADING_MAP_MODE,\n+\t\tANDROID_STATISTICS_SCENE_FLICKER,\n+\t};\n+\tstaticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_RESULT_KEYS,\n+\t\t\t\t availableResultKeys.data(),\n+\t\t\t\t availableResultKeys.size());\n+\n \tif (!staticMetadata_->isValid()) {\n \t\tdelete staticMetadata_;\n \t\tstaticMetadata_ = nullptr;\n","prefixes":["libcamera-devel","v6","9/9"]}