Patch Detail
Show a patch.
GET /api/1.1/patches/14640/?format=api
{ "id": 14640, "url": "https://patchwork.libcamera.org/api/1.1/patches/14640/?format=api", "web_url": "https://patchwork.libcamera.org/patch/14640/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20211119094151.834276-1-paul.elder@ideasonboard.com>", "date": "2021-11-19T09:41:51", "name": "[libcamera-devel,v3] android: Check exposure time range for manual sensor capability", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "b532cdc38df649978c812f2fe3f4e9106dbefa4d", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/1.1/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/14640/mbox/", "series": [ { "id": 2730, "url": "https://patchwork.libcamera.org/api/1.1/series/2730/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2730", "date": "2021-11-19T09:41:51", "name": "[libcamera-devel,v3] android: Check exposure time range for manual sensor capability", "version": 3, "mbox": "https://patchwork.libcamera.org/series/2730/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/14640/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/14640/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 54108BF415\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 19 Nov 2021 09:42:10 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 742A260371;\n\tFri, 19 Nov 2021 10:42:09 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C02C56022F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 19 Nov 2021 10:42:08 +0100 (CET)", "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 E0A445A7;\n\tFri, 19 Nov 2021 10:42:05 +0100 (CET)" ], "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=\"QFmJPRj3\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1637314928;\n\tbh=0VUPZUzhzj0Fhcl/uzx4bUr6od+TyjfzhwrKfEoe1Nc=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=QFmJPRj3cu9Aag7M7RXme5cAdtSw1qUR6iiuztX4+XR39pJKN8P8fnl1geDbmEjNX\n\tN5I5DQjwf+up4ohaavVGK2FqT6kwuhdY4Anbk4sEb/GXA6VhQtwBIQJu6SisVaovB3\n\thAJdaNfFcQB6FNXSo2oYX4daLqel+AbcPr97IJpY=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 19 Nov 2021 18:41:51 +0900", "Message-Id": "<20211119094151.834276-1-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.27.0", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3] android: Check exposure time range for\n\tmanual sensor capability", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "In the manual sensor capability validator, add a check for the presence\nof the exposure time range key, and for the maximum exposure time. The\nminimum exposure time is a requirement for adding the key in the first\nplace; add a check for this as well.\n\nIf either requirement is not met, the manual sensor capability\nvalidation will fail, therefore disabling the FULL hardware level. The\nexposure time range key is optional in non-FULL hardware levels.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nReviewed-by: Umang Jain <umang.jain@ideasonboard.com>\n\n---\nChanges in v3:\n- squash \"android: capabilities: Add exposure time keys only if\n available\"\n- fix the minumum exposure time check\n - only make the exposure time range key available if this check\n passes. additionally, if the max exposure time passes its check,\n tick the box for manual sensor and FULL\n- update commit message accordingly\n\nChanges in v2:\n- fix comparator order (cosmetic)\n- change comparators and comments to \"equal or\", as that is what is\n specificied in the hal docs\n- add check for minimum exposure time when initializing static metadata\n---\n src/android/camera_capabilities.cpp | 33 +++++++++++++++++++++++++----\n 1 file changed, 29 insertions(+), 4 deletions(-)", "diff": "diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\nindex f357902e..8529444a 100644\n--- a/src/android/camera_capabilities.cpp\n+++ b/src/android/camera_capabilities.cpp\n@@ -217,6 +217,8 @@ std::vector<U> setMetadata(CameraMetadata *metadata, uint32_t tag,\n \n bool CameraCapabilities::validateManualSensorCapability()\n {\n+\tcamera_metadata_ro_entry_t entry;\n+\n \tconst char *noMode = \"Manual sensor capability unavailable: \";\n \n \tif (!staticMetadata_->entryContains<uint8_t>(ANDROID_CONTROL_AE_AVAILABLE_MODES,\n@@ -231,6 +233,19 @@ bool CameraCapabilities::validateManualSensorCapability()\n \t\treturn false;\n \t}\n \n+\tif (!staticMetadata_->hasEntry(ANDROID_SENSOR_INFO_EXPOSURE_TIME_RANGE)) {\n+\t\tLOG(HAL, Info) << noMode << \"missing exposure time range\";\n+\t\treturn false;\n+\t}\n+\n+\tstaticMetadata_->getEntry(ANDROID_SENSOR_INFO_EXPOSURE_TIME_RANGE, &entry);\n+\tif (entry.data.i32[1] <= 100000000) {\n+\t\tLOG(HAL, Info)\n+\t\t\t<< noMode\n+\t\t\t<< \"exposure time range maximum must be larger than 100ms\";\n+\t\treturn false;\n+\t}\n+\n \t/*\n \t * \\todo Return true here after we satisfy all the requirements:\n \t * https://developer.android.com/reference/android/hardware/camera2/CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR\n@@ -790,7 +805,6 @@ int CameraCapabilities::initializeStaticMetadata()\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@@ -868,7 +882,6 @@ int CameraCapabilities::initializeStaticMetadata()\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@@ -1074,8 +1087,20 @@ int CameraCapabilities::initializeStaticMetadata()\n \t\t\texposureInfo->second.min().get<int32_t>() * 1000LL,\n \t\t\texposureInfo->second.max().get<int32_t>() * 1000LL,\n \t\t};\n-\t\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_EXPOSURE_TIME_RANGE,\n-\t\t\t\t\t exposureTimeRange, 2);\n+\n+\t\tif (exposureTimeRange[0] < 100000) {\n+\t\t\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_EXPOSURE_TIME_RANGE,\n+\t\t\t\t\texposureTimeRange, 2);\n+\n+\t\t\tavailableCharacteristicsKeys_.insert(ANDROID_SENSOR_INFO_EXPOSURE_TIME_RANGE);\n+\t\t\tavailableRequestKeys_.insert(ANDROID_SENSOR_EXPOSURE_TIME);\n+\t\t\tavailableResultKeys_.insert(ANDROID_SENSOR_EXPOSURE_TIME);\n+\t\t} else {\n+\t\t\tLOG(HAL, Info)\n+\t\t\t\t<< \"Minimum exposure time \"\n+\t\t\t\t<< exposureTimeRange[0]\n+\t\t\t\t<< \"ns is too big (should be smaller than 100us)\";\n+\t\t}\n \t}\n \n \tstaticMetadata_->addEntry(ANDROID_SENSOR_ORIENTATION, orientation_);\n", "prefixes": [ "libcamera-devel", "v3" ] }