{"id":11057,"url":"https://patchwork.libcamera.org/api/patches/11057/?format=json","web_url":"https://patchwork.libcamera.org/patch/11057/","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":"<20210129142615.669464-2-jacopo@jmondi.org>","date":"2021-01-29T14:26:13","name":"[libcamera-devel,1/3] android: camera_device: Alphabetically sort keys","commit_ref":"6741ab8919493da2cd662c30efb4128bcb6af16e","pull_url":null,"state":"accepted","archived":false,"hash":"e52f0048c98377ee3360834fc045bf21b8c653ca","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/11057/mbox/","series":[{"id":1626,"url":"https://patchwork.libcamera.org/api/series/1626/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1626","date":"2021-01-29T14:26:12","name":"android: Add missing Request keys","version":1,"mbox":"https://patchwork.libcamera.org/series/1626/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11057/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11057/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 7A1AAC33BB\n\tfor ;\n\tFri, 29 Jan 2021 14:26:02 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 441EF683B2;\n\tFri, 29 Jan 2021 15:26:02 +0100 (CET)","from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net\n\t[217.70.183.200])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B595768369\n\tfor ;\n\tFri, 29 Jan 2021 15:25:59 +0100 (CET)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 7FC982000D\n\tfor ;\n\tFri, 29 Jan 2021 14:25:59 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 29 Jan 2021 15:26:13 +0100","Message-Id":"<20210129142615.669464-2-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.30.0","In-Reply-To":"<20210129142615.669464-1-jacopo@jmondi.org>","References":"<20210129142615.669464-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 1/3] android: camera_device:\n\tAlphabetically sort keys","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The vectors of available characteristics, request and result keys\nare not sorted. This makes more complex than necessary spotting\nduplication of keys.\n\nRe-sort the vector initializer lists alphabetically.\n\nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 100 +++++++++++++++++-----------------\n 1 file changed, 50 insertions(+), 50 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 741dc8cfa635..83e2734541e3 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1162,72 +1162,72 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\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_CONTROL_AE_LOCK_AVAILABLE,\n-\t\tANDROID_CONTROL_AWB_LOCK_AVAILABLE,\n-\t\tANDROID_CONTROL_AVAILABLE_MODES,\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_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_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_STREAM_CONFIGURATIONS,\n-\t\tANDROID_SCALER_AVAILABLE_STALL_DURATIONS,\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_INFO_SUPPORTED_HARDWARE_LEVEL,\n-\t\tANDROID_REQUEST_PARTIAL_RESULT_COUNT,\n-\t\tANDROID_REQUEST_PIPELINE_MAX_DEPTH,\n-\t\tANDROID_REQUEST_MAX_NUM_OUTPUT_STREAMS,\n-\t\tANDROID_REQUEST_MAX_NUM_INPUT_STREAMS,\n-\t\tANDROID_REQUEST_AVAILABLE_CAPABILITIES,\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_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.data(),\n \t\t\t\t availableCharacteristicsKeys.size());\n \n \tstd::vector availableRequestKeys = {\n-\t\tANDROID_CONTROL_AE_MODE,\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_AE_ANTIBANDING_MODE,\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_CONTROL_AWB_MODE,\n+\t\tANDROID_CONTROL_CAPTURE_INTENT,\n+\t\tANDROID_CONTROL_MODE,\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_LENS_APERTURE,\n \t\tANDROID_LENS_OPTICAL_STABILIZATION_MODE,\n-\t\tANDROID_CONTROL_MODE,\n-\t\tANDROID_CONTROL_CAPTURE_INTENT,\n+\t\tANDROID_NOISE_REDUCTION_MODE,\n+\t\tANDROID_STATISTICS_FACE_DETECT_MODE\n \t};\n \tstaticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_REQUEST_KEYS,\n \t\t\t\t availableRequestKeys.data(),\n@@ -1237,14 +1237,14 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\tANDROID_CONTROL_AE_ANTIBANDING_MODE,\n \t\tANDROID_CONTROL_AE_LOCK,\n \t\tANDROID_CONTROL_AE_MODE,\n-\t\tANDROID_CONTROL_AE_TARGET_FPS_RANGE,\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_MODE,\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@@ -1253,27 +1253,27 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\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_STATE,\n \t\tANDROID_LENS_OPTICAL_STABILIZATION_MODE,\n-\t\tANDROID_SENSOR_TIMESTAMP,\n-\t\tANDROID_SENSOR_ROLLING_SHUTTER_SKEW,\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_ROLLING_SHUTTER_SKEW,\n+\t\tANDROID_SENSOR_TIMESTAMP,\n \t\tANDROID_STATISTICS_FACE_DETECT_MODE,\n \t\tANDROID_STATISTICS_LENS_SHADING_MAP_MODE,\n \t\tANDROID_STATISTICS_SCENE_FLICKER,\n-\t\tANDROID_NOISE_REDUCTION_MODE,\n-\t\tANDROID_REQUEST_PIPELINE_DEPTH,\n-\t\tANDROID_SCALER_CROP_REGION,\n-\t\tANDROID_JPEG_GPS_COORDINATES,\n-\t\tANDROID_JPEG_GPS_PROCESSING_METHOD,\n-\t\tANDROID_JPEG_GPS_TIMESTAMP,\n-\t\tANDROID_JPEG_SIZE,\n-\t\tANDROID_JPEG_QUALITY,\n-\t\tANDROID_JPEG_ORIENTATION,\n-\t\tANDROID_JPEG_THUMBNAIL_QUALITY,\n-\t\tANDROID_JPEG_THUMBNAIL_SIZE,\n \t};\n \tstaticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_RESULT_KEYS,\n \t\t\t\t availableResultKeys.data(),\n","prefixes":["libcamera-devel","1/3"]}