Patch Detail
Show a patch.
GET /api/1.1/patches/21005/?format=api
{ "id": 21005, "url": "https://patchwork.libcamera.org/api/1.1/patches/21005/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21005/", "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": "<20240823143205.2668765-4-chenghaoyang@google.com>", "date": "2024-08-23T14:29:10", "name": "[v2,3/3] libcamera: android: Add face detection control support", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "7eb94550a45d5fc8d34b14fed7cf9f2c5114fed0", "submitter": { "id": 117, "url": "https://patchwork.libcamera.org/api/1.1/people/117/?format=api", "name": "Cheng-Hao Yang", "email": "chenghaoyang@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21005/mbox/", "series": [ { "id": 4536, "url": "https://patchwork.libcamera.org/api/1.1/series/4536/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4536", "date": "2024-08-23T14:29:07", "name": "Add Face Detection Controls", "version": 2, "mbox": "https://patchwork.libcamera.org/series/4536/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21005/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21005/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 64BA8BDE17\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 23 Aug 2024 14:32:21 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 78CD5633D7;\n\tFri, 23 Aug 2024 16:32:18 +0200 (CEST)", "from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com\n\t[IPv6:2a00:1450:4864:20::42e])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DB11E633CF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 23 Aug 2024 16:32:10 +0200 (CEST)", "by mail-wr1-x42e.google.com with SMTP id\n\tffacd0b85a97d-3719f0758c6so1109981f8f.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 23 Aug 2024 07:32:10 -0700 (PDT)", "from chenghaoyang-germany.c.googlers.com.com\n\t(161.126.77.34.bc.googleusercontent.com. [34.77.126.161])\n\tby smtp.gmail.com with ESMTPSA id\n\tffacd0b85a97d-373081ffb66sm4300627f8f.84.2024.08.23.07.32.09\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 23 Aug 2024 07:32:09 -0700 (PDT)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"dBv1GOI7\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1724423530; x=1725028330;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=aH7hiKimyPigrNoK5TEoeqT1W2nUv57fQS07j7w7vd0=;\n\tb=dBv1GOI7/gRggAFYI+0y5ieA4aTnfRwCdvib+XzSba0he2eMtzNDX0P/DxShqndDO4\n\tNTf2o3pxHqZMD99v0wVGywhAVCV18MacxE08XYUibd+HCC4/CLzG+Ni2r7LTzTndGaRb\n\t5tzFk1cs/F83myTlv5BNW+CfvA1bqS+I4TibU=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1724423530; x=1725028330;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=aH7hiKimyPigrNoK5TEoeqT1W2nUv57fQS07j7w7vd0=;\n\tb=JJrM64XFzfE3HkAcMNbstI5EHOo/7kJn7w3SY73XuS96MmuLXffZl/8T1i6yaeRS5q\n\tVOnlU4SofcMSvXB0yUXRLmP560rwpiIpFFhfqNxQMaY6baXf6v9M1oC+RYe2MG2mrrpe\n\tyromd26ELDDClFuqo1YuM/gdEcvhIo8z9+3nLqyqyrBVXQUtw7KvD2YAmN+rzDbuZQ/S\n\tlNfMKilZBsV+qXY9Q+1TBfZSj0CBAUL36fBXv9DQi/bO21uN5Hb+sQ8u/XgdwXox42pN\n\t9m8Yd1bkKBw/H4lihVcefDnvT3dipm2bXX3nKUXQ5jnMR22GAAkRhDC1PMtOg7y3B0o6\n\tRjgg==", "X-Gm-Message-State": "AOJu0Yx/4ye4ps0On8MswUDbR95celMfT2xeyuicalD420bZKE5yD44V\n\txt/hMDhoTH7vaMAlLa2LlT7yXmNuMZpSfOGJFfgXYh4wXgJvtO2mciHDrHrAwUfoRkaQYWD0Br0\n\t6Rg==", "X-Google-Smtp-Source": "AGHT+IFqeKDVYybOSYwXSsdkvthCF9O0KgiFc06MqAkSozNwUAv5doLD9IxhVyPxR7a1/Q6RY+h1vA==", "X-Received": "by 2002:adf:b19c:0:b0:368:37e3:dff7 with SMTP id\n\tffacd0b85a97d-37311863b94mr1701776f8f.34.1724423530095; \n\tFri, 23 Aug 2024 07:32:10 -0700 (PDT)", "From": "Harvey Yang <chenghaoyang@chromium.org>", "X-Google-Original-From": "Harvey Yang <chenghaoyang@google.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Yudhistira Erlandinata <yerlandinata@chromium.org>,\n\tHarvey Yang <chenghaoyang@chromium.org>", "Subject": "[PATCH v2 3/3] libcamera: android: Add face detection control\n\tsupport", "Date": "Fri, 23 Aug 2024 14:29:10 +0000", "Message-ID": "<20240823143205.2668765-4-chenghaoyang@google.com>", "X-Mailer": "git-send-email 2.46.0.295.g3b9ea8a38a-goog", "In-Reply-To": "<20240823143205.2668765-1-chenghaoyang@google.com>", "References": "<20240823143205.2668765-1-chenghaoyang@google.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: Yudhistira Erlandinata <yerlandinata@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\nSquashed CL:\nhttps://chromium-review.googlesource.com/c/chromiumos/third_party/libcamera/+/5065292\n\nDon't use ControlInfoMap::count() and ControlInfoMap::at() because\nits internal assumption is wrong: The ControlIdMap and its idmap have a\n1:1 mapping between their entries.\n\nBUG=b:308713855\nTEST=emerge-geralt libcamera-mtkisp7\n\nSigned-off-by: Yudhistira Erlandinata <yerlandinata@chromium.org>\nCo-developed-by: Harvey Yang <chenghaoyang@chromium.org>\n---\n src/android/camera_capabilities.cpp | 41 ++++++++++++++++--\n src/android/camera_device.cpp | 64 +++++++++++++++++++++++++++--\n 2 files changed, 98 insertions(+), 7 deletions(-)", "diff": "diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\nindex 71043e127..31d113d51 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,43 @@ 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::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+\t\tfor (const auto &value : faceDetectCtrlInfo.values()) {\n+\t\t\tauto mode = value.get<uint8_t>();\n+\t\t\tuint8_t androidMode = 0;\n+\t\t\tswitch (mode) {\n+\t\t\tcase controls::FaceDetectModeOff:\n+\t\t\t\tandroidMode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;\n+\t\t\t\tbreak;\n+\t\t\tcase controls::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: \"\n+\t\t\t\t\t\t<< static_cast<int>(mode);\n+\t\t\t}\n+\t\t\tfaceDetectModes.push_back(androidMode);\n+\t\t}\n+\t\tif (hasFaceDetection) {\n+\t\t\t// todo(yerlandinata): Create new libcamera controls\n+\t\t\t// to query max possible faces detected.\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 493f66e7b..cd600eade 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -9,12 +9,12 @@\n \n #include <algorithm>\n #include <fstream>\n-#include <set>\n #include <sys/mman.h>\n #include <unistd.h>\n #include <vector>\n \n #include <libcamera/base/log.h>\n+#include <libcamera/base/span.h>\n #include <libcamera/base/unique_fd.h>\n #include <libcamera/base/utils.h>\n \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,14 @@ 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::FaceDetectMode, data[0]);\n+\t\tif (!controls.get(controls::FaceDetectMode)) {\n+\t\t\tLOG(HAL, Warning) << \"Pipeline doesn't support controls::FaceDetectMode\";\n+\t\t}\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 +1549,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+\tsettings.getEntry(ANDROID_STATISTICS_FACE_DETECT_MODE, &entry);\n+\tresultMetadata->addEntry(ANDROID_STATISTICS_FACE_DETECT_MODE,\n+\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 +1590,54 @@ 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::FaceDetectFaceRectangles);\n+\tif (faceDetectRectangles) {\n+\t\tconst Span<const Rectangle> rectangles = *faceDetectRectangles;\n+\t\tstd::vector<int32_t> flatRectangles;\n+\t\tfor (const Rectangle &rect : rectangles) {\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::FaceDetectFaceScores);\n+\tif (faceDetectRectangles && faceDetectFaceScores) {\n+\t\tconst Span<const uint8_t> &scores = *faceDetectFaceScores;\n+\t\tif (scores.size() != faceDetectRectangles->size()) {\n+\t\t\tLOG(HAL, Error) << \"Pipeline returned wrong number of face scores; \"\n+\t\t\t\t\t<< \"Expected: \"\n+\t\t\t\t\t<< faceDetectRectangles->size()\n+\t\t\t\t\t<< \", got:\" << scores.size();\n+\t\t}\n+\t\tresultMetadata->addEntry(ANDROID_STATISTICS_FACE_SCORES, scores);\n+\t}\n+\n+\tconst auto &faceDetectFaceLandmarks =\n+\t\tmetadata.get(controls::FaceDetectFaceLandmark);\n+\tif (faceDetectFaceScores && faceDetectRectangles &&\n+\t faceDetectFaceLandmarks) {\n+\t\tconst auto &landmarks = *faceDetectFaceLandmarks;\n+\t\tsize_t expectedLandmarks = faceDetectRectangles->size() * 3;\n+\t\tstd::vector<int32_t> androidLandmarks;\n+\t\tfor (const auto &landmark : landmarks) {\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\tif (landmarks.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: \" << landmarks.size();\n+\t\t}\n+\t}\n+\n \tconst auto &scalerCrop = metadata.get(controls::ScalerCrop);\n \tif (scalerCrop) {\n \t\tconst Rectangle &crop = *scalerCrop;\n", "prefixes": [ "v2", "3/3" ] }