Patch Detail
Show a patch.
GET /api/1.1/patches/21001/?format=api
{ "id": 21001, "url": "https://patchwork.libcamera.org/api/1.1/patches/21001/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21001/", "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": "<20240823131148.2449434-4-chenghaoyang@google.com>", "date": "2024-08-23T13:07:35", "name": "[v1,3/3] libcamera: android: Add face detection control support", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "6a583626ae2a40cb4b71ca3663852f2eea8f182a", "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/21001/mbox/", "series": [ { "id": 4535, "url": "https://patchwork.libcamera.org/api/1.1/series/4535/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4535", "date": "2024-08-23T13:07:32", "name": "Add Face Detection Controls", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4535/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21001/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21001/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 99B8BC32C2\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 23 Aug 2024 13:12:01 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CDA3A633D2;\n\tFri, 23 Aug 2024 15:11:58 +0200 (CEST)", "from mail-wm1-x334.google.com (mail-wm1-x334.google.com\n\t[IPv6:2a00:1450:4864:20::334])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 06A50633D2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 23 Aug 2024 15:11:52 +0200 (CEST)", "by mail-wm1-x334.google.com with SMTP id\n\t5b1f17b1804b1-428fb103724so15987655e9.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 23 Aug 2024 06:11:52 -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-3730810ffb9sm4185000f8f.7.2024.08.23.06.11.51\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 23 Aug 2024 06:11:51 -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=\"KNROJX9V\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1724418712; x=1725023512;\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=TnlCiqzXEKYTAvjt8obOzNnSj3e1aMSJAms5MbC4p9E=;\n\tb=KNROJX9VDYn1MqmdWb6tJfEKX3ATDXXPSbealGk5wd6mIMT8ytgpmkHqklZGpCjh5k\n\tsSo9ZnpRXK3C56QzMfZZLNGcr1OXwP/eeIQT83iE01fHoKe/GaNb66Jxemtl8lWDVgZA\n\tCLKxSv07C/B3o4SdbeDLlfRfigbBlWKk8PEfc=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1724418712; x=1725023512;\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=TnlCiqzXEKYTAvjt8obOzNnSj3e1aMSJAms5MbC4p9E=;\n\tb=VJPBzuko9VxOvdrhFdDMU2aOGwoQ1KYYmHPLJ+HQigEzOuuNm4/E5y1VV6RxmzL7xY\n\tjI+q35fw1RdHUDt+9pZ0opNEU/4HnqKolRUJkcodaJNY32uN7Q2ipOxMgOlbF1vsQfbF\n\tHp9QZ3ri7MZjQwo13t1S+d6DayQbN0B/zIgRFObPvtt3E+SPdV1bbxGC3rz9Us1zGC5N\n\t8lDda/juEc+lQauB2DlVQ2e6wjNNCaHyCj+FgovAw4crWU50TxCJdf76nALdqBkFY/2R\n\tcEjCNBQ1meGM/jFiBIwv0+Uw46FXuHCEseGWAXifOvGtglAJ9XmgDWOaYxG8xUtPZlFM\n\t9vpg==", "X-Gm-Message-State": "AOJu0YxVHo6tUzJ8HsFx7lbp864DWC52Wfip6t32KgSftP7uE1MwRqUB\n\tGd45eAw86p5Hf+4CMXY/1m3rucQDiQsgaRwzRqxcLwqZo3svioLKhongXo9/WORndOHHqnlHkgA\n\tTdods", "X-Google-Smtp-Source": "AGHT+IHKsjZSymM2ZthRY07TdXxQk2zPHParmMfbiTyxmvCi8Y6JHkUOsqsIEjVIP5OxVbnGEW431Q==", "X-Received": "by 2002:a5d:6e8b:0:b0:36b:5d86:d885 with SMTP id\n\tffacd0b85a97d-373052b51a8mr3713078f8f.24.1724418711669; \n\tFri, 23 Aug 2024 06:11:51 -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 v1 3/3] libcamera: android: Add face detection control\n\tsupport", "Date": "Fri, 23 Aug 2024 13:07:35 +0000", "Message-ID": "<20240823131148.2449434-4-chenghaoyang@google.com>", "X-Mailer": "git-send-email 2.46.0.295.g3b9ea8a38a-goog", "In-Reply-To": "<20240823131148.2449434-1-chenghaoyang@google.com>", "References": "<20240823131148.2449434-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\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..556edb471 100644\n--- a/src/android/camera_capabilities.cpp\n+++ b/src/android/camera_capabilities.cpp\n@@ -10,6 +10,7 @@\n #include <algorithm>\n #include <array>\n #include <cmath>\n+#include <cstdint>\n #include <map>\n #include <type_traits>\n \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+\tif (camera_->controls().count(controls::FaceDetectMode.id()) > 0) {\n+\t\tconst ControlInfo &faceDetectCtrlInfo =\n+\t\t\tcamera_->controls().at(controls::FaceDetectMode.id());\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": [ "v1", "3/3" ] }