Patch Detail
Show a patch.
GET /api/1.1/patches/21470/?format=api
{ "id": 21470, "url": "https://patchwork.libcamera.org/api/1.1/patches/21470/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21470/", "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": "<20241002055002.6271-5-jacopo.mondi@ideasonboard.com>", "date": "2024-10-02T05:50:02", "name": "[v10,5/5] libcamera: android: Add face detection control support", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "f331cdbb78451b7cc203bfcf50d1d5d8d7a8860a", "submitter": { "id": 143, "url": "https://patchwork.libcamera.org/api/1.1/people/143/?format=api", "name": "Jacopo Mondi", "email": "jacopo.mondi@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21470/mbox/", "series": [ { "id": 4647, "url": "https://patchwork.libcamera.org/api/1.1/series/4647/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4647", "date": "2024-10-01T19:13:44", "name": "Add Face Detection Controls", "version": 10, "mbox": "https://patchwork.libcamera.org/series/4647/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21470/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21470/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 4C232BD80A\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 2 Oct 2024 05:50:29 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 45CDE6352D;\n\tWed, 2 Oct 2024 07:50:26 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DD72A6352A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 2 Oct 2024 07:50:18 +0200 (CEST)", "from ideasonboard.com (unknown [5.77.88.238])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 330A663F;\n\tWed, 2 Oct 2024 07:48:46 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"qc2XapjE\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1727848126;\n\tbh=+NwwauNPwrHz7nmY/bKT5sxXDeiCk8+5e/M63V5w8Ks=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=qc2XapjE+5qy8eehHevadT3ppEyLVAAOCcDX7iGzHYjq/hlZ/dUDCkAhnYlMwcJKC\n\tnVr9+HWwk8B827fBxFd3HZKVtFlr/lywqTmyZhY9IbB4PGsvmofbte77hITX2DKGYg\n\teomERZVmVmAAHIzg3JcZeb31EOOxmd9wzy6Jfl6w=", "From": "Jacopo Mondi <jacopo.mondi@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Harvey Yang <chenghaoyang@google.com>,\n\tHarvey Yang <chenghaoyang@chromium.org>,\n\tJacopo Mondi <jacopo.mondi@ideasonboard.com>", "Subject": "[PATCH v10 5/5] libcamera: android: Add face detection control\n\tsupport", "Date": "Wed, 2 Oct 2024 07:50:02 +0200", "Message-ID": "<20241002055002.6271-5-jacopo.mondi@ideasonboard.com>", "X-Mailer": "git-send-email 2.46.1", "In-Reply-To": "<20241002055002.6271-1-jacopo.mondi@ideasonboard.com>", "References": "<20241001191354.55056-1-jacopo.mondi@ideasonboard.com>\n\t<20241002055002.6271-1-jacopo.mondi@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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": "From: Harvey Yang <chenghaoyang@chromium.org>\n\nAllow Android HAL adapter to pass the face detection metadata control to\nthe pipeline and also send face detection metadata to the camera client\nif the pipeline generates it.\n\nSigned-off-by: Yudhistira Erlandinata <yerlandinata@chromium.org>\nCo-developed-by: Harvey Yang <chenghaoyang@chromium.org>\nSigned-off-by: Harvey Yang <chenghaoyang@chromium.org>\nReviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\nSigned-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\nReviewed-by: Harvey Yang <chenghaoyang@chromium.org>\n---\n src/android/camera_capabilities.cpp | 44 +++++++++++++++++--\n src/android/camera_device.cpp | 66 ++++++++++++++++++++++++++++-\n 2 files changed, 104 insertions(+), 6 deletions(-)", "diff": "diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\nindex 71043e127497..b161bc6b3ed6 100644\n--- a/src/android/camera_capabilities.cpp\n+++ b/src/android/camera_capabilities.cpp\n@@ -11,6 +11,7 @@\n #include <array>\n #include <cmath>\n #include <map>\n+#include <stdint.h>\n #include <type_traits>\n \n #include <hardware/camera3.h>\n@@ -1176,11 +1177,46 @@ int CameraCapabilities::initializeStaticMetadata()\n \t\t\t\t maxFrameDuration_);\n \n \t/* Statistics static metadata. */\n-\tuint8_t faceDetectMode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;\n-\tstaticMetadata_->addEntry(ANDROID_STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES,\n-\t\t\t\t faceDetectMode);\n-\n \tint32_t maxFaceCount = 0;\n+\tauto iter = camera_->controls().find(controls::draft::FaceDetectMode.id());\n+\tif (iter != camera_->controls().end()) {\n+\t\tconst ControlInfo &faceDetectCtrlInfo = iter->second;\n+\t\tstd::vector<uint8_t> faceDetectModes;\n+\t\tbool hasFaceDetection = false;\n+\n+\t\tfor (const auto &value : faceDetectCtrlInfo.values()) {\n+\t\t\tint32_t mode = value.get<int32_t>();\n+\t\t\tuint8_t androidMode = 0;\n+\n+\t\t\tswitch (mode) {\n+\t\t\tcase controls::draft::FaceDetectModeOff:\n+\t\t\t\tandroidMode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;\n+\t\t\t\tbreak;\n+\t\t\tcase controls::draft::FaceDetectModeSimple:\n+\t\t\t\tandroidMode = ANDROID_STATISTICS_FACE_DETECT_MODE_SIMPLE;\n+\t\t\t\thasFaceDetection = true;\n+\t\t\t\tbreak;\n+\t\t\tdefault:\n+\t\t\t\tLOG(HAL, Fatal) << \"Received invalid face detect mode: \" << mode;\n+\t\t\t}\n+\t\t\tfaceDetectModes.push_back(androidMode);\n+\t\t}\n+\t\tif (hasFaceDetection) {\n+\t\t\t/*\n+\t\t\t * \\todo Create new libcamera controls to query max\n+\t\t\t * possible faces detected.\n+\t\t\t */\n+\t\t\tmaxFaceCount = 10;\n+\t\t\tstaticMetadata_->addEntry(\n+\t\t\t\tANDROID_STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES,\n+\t\t\t\tfaceDetectModes.data(), faceDetectModes.size());\n+\t\t}\n+\t} else {\n+\t\tuint8_t faceDetectMode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;\n+\t\tstaticMetadata_->addEntry(ANDROID_STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES,\n+\t\t\t\t\t faceDetectMode);\n+\t}\n+\n \tstaticMetadata_->addEntry(ANDROID_STATISTICS_INFO_MAX_FACE_COUNT,\n \t\t\t\t maxFaceCount);\n \ndiff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 493f66e7b38f..a038131ae39e 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -22,6 +22,7 @@\n #include <libcamera/controls.h>\n #include <libcamera/fence.h>\n #include <libcamera/formats.h>\n+#include <libcamera/geometry.h>\n #include <libcamera/property_ids.h>\n \n #include \"system/graphics.h\"\n@@ -813,6 +814,11 @@ int CameraDevice::processControls(Camera3RequestDescriptor *descriptor)\n \t\tcontrols.set(controls::ScalerCrop, cropRegion);\n \t}\n \n+\tif (settings.getEntry(ANDROID_STATISTICS_FACE_DETECT_MODE, &entry)) {\n+\t\tconst uint8_t *data = entry.data.u8;\n+\t\tcontrols.set(controls::draft::FaceDetectMode, data[0]);\n+\t}\n+\n \tif (settings.getEntry(ANDROID_SENSOR_TEST_PATTERN_MODE, &entry)) {\n \t\tconst int32_t data = *entry.data.i32;\n \t\tint32_t testPatternMode = controls::draft::TestPatternModeOff;\n@@ -1540,8 +1546,9 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) cons\n \tvalue32 = ANDROID_SENSOR_TEST_PATTERN_MODE_OFF;\n \tresultMetadata->addEntry(ANDROID_SENSOR_TEST_PATTERN_MODE, value32);\n \n-\tvalue = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;\n-\tresultMetadata->addEntry(ANDROID_STATISTICS_FACE_DETECT_MODE, value);\n+\tif (settings.getEntry(ANDROID_STATISTICS_FACE_DETECT_MODE, &entry))\n+\t\tresultMetadata->addEntry(ANDROID_STATISTICS_FACE_DETECT_MODE,\n+\t\t\t\t\t entry.data.u8, 1);\n \n \tvalue = ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_OFF;\n \tresultMetadata->addEntry(ANDROID_STATISTICS_LENS_SHADING_MAP_MODE,\n@@ -1580,6 +1587,61 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) cons\n \t\tresultMetadata->addEntry(ANDROID_SENSOR_FRAME_DURATION,\n \t\t\t\t\t *frameDuration * 1000);\n \n+\tconst auto &faceDetectRectangles =\n+\t\tmetadata.get(controls::draft::FaceDetectFaceRectangles);\n+\tif (faceDetectRectangles) {\n+\t\tstd::vector<int32_t> flatRectangles;\n+\t\tfor (const Rectangle &rect : *faceDetectRectangles) {\n+\t\t\tflatRectangles.push_back(rect.x);\n+\t\t\tflatRectangles.push_back(rect.y);\n+\t\t\tflatRectangles.push_back(rect.x + rect.width);\n+\t\t\tflatRectangles.push_back(rect.y + rect.height);\n+\t\t}\n+\t\tresultMetadata->addEntry(\n+\t\t\tANDROID_STATISTICS_FACE_RECTANGLES, flatRectangles);\n+\t}\n+\n+\tconst auto &faceDetectFaceScores =\n+\t\tmetadata.get(controls::draft::FaceDetectFaceScores);\n+\tif (faceDetectRectangles && faceDetectFaceScores) {\n+\t\tif (faceDetectFaceScores->size() != faceDetectRectangles->size()) {\n+\t\t\tLOG(HAL, Error) << \"Pipeline returned wrong number of face scores; \"\n+\t\t\t\t\t<< \"Expected: \" << faceDetectRectangles->size()\n+\t\t\t\t\t<< \", got: \" << faceDetectFaceScores->size();\n+\t\t}\n+\t\tresultMetadata->addEntry(ANDROID_STATISTICS_FACE_SCORES,\n+\t\t\t\t\t *faceDetectFaceScores);\n+\t}\n+\n+\tconst auto &faceDetectFaceLandmarks =\n+\t\tmetadata.get(controls::draft::FaceDetectFaceLandmarks);\n+\tif (faceDetectRectangles && faceDetectFaceLandmarks) {\n+\t\tsize_t expectedLandmarks = faceDetectRectangles->size() * 3;\n+\t\tif (faceDetectFaceLandmarks->size() != expectedLandmarks) {\n+\t\t\tLOG(HAL, Error) << \"Pipeline returned wrong number of face landmarks; \"\n+\t\t\t\t\t<< \"Expected: \" << expectedLandmarks\n+\t\t\t\t\t<< \", got: \" << faceDetectFaceLandmarks->size();\n+\t\t}\n+\n+\t\tstd::vector<int32_t> androidLandmarks;\n+\t\tfor (const Point &landmark : *faceDetectFaceLandmarks) {\n+\t\t\tandroidLandmarks.push_back(landmark.x);\n+\t\t\tandroidLandmarks.push_back(landmark.y);\n+\t\t}\n+\t\tresultMetadata->addEntry(\n+\t\t\tANDROID_STATISTICS_FACE_LANDMARKS, androidLandmarks);\n+\t}\n+\n+\tconst auto &faceDetectFaceIds = metadata.get(controls::draft::FaceDetectFaceIds);\n+\tif (faceDetectRectangles && faceDetectFaceIds) {\n+\t\tif (faceDetectFaceIds->size() != faceDetectRectangles->size()) {\n+\t\t\tLOG(HAL, Error) << \"Pipeline returned wrong number of face ids; \"\n+\t\t\t\t\t<< \"Expected: \" << faceDetectRectangles->size()\n+\t\t\t\t\t<< \", got: \" << faceDetectFaceIds->size();\n+\t\t}\n+\t\tresultMetadata->addEntry(ANDROID_STATISTICS_FACE_IDS, *faceDetectFaceIds);\n+\t}\n+\n \tconst auto &scalerCrop = metadata.get(controls::ScalerCrop);\n \tif (scalerCrop) {\n \t\tconst Rectangle &crop = *scalerCrop;\n", "prefixes": [ "v10", "5/5" ] }