Patch Detail
Show a patch.
GET /api/1.1/patches/21336/?format=api
{ "id": 21336, "url": "https://patchwork.libcamera.org/api/1.1/patches/21336/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21336/", "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": "<20240923144921.1729183-3-chenghaoyang@google.com>", "date": "2024-09-23T14:45:04", "name": "[v6,2/3] libcamera: Add face detection controls", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "c2c3313169adba79419cbddd7acdc1a985f7e47a", "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/21336/mbox/", "series": [ { "id": 4615, "url": "https://patchwork.libcamera.org/api/1.1/series/4615/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4615", "date": "2024-09-23T14:45:02", "name": "Add Face Detection Controls", "version": 6, "mbox": "https://patchwork.libcamera.org/series/4615/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21336/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21336/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 D13F9C0F1B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 23 Sep 2024 14:49:37 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 82EF96351A;\n\tMon, 23 Sep 2024 16:49:37 +0200 (CEST)", "from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com\n\t[IPv6:2607:f8b0:4864:20::42a])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B0B8E634FB\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 23 Sep 2024 16:49:32 +0200 (CEST)", "by mail-pf1-x42a.google.com with SMTP id\n\td2e1a72fcca58-71971d20a95so3025196b3a.3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 23 Sep 2024 07:49:32 -0700 (PDT)", "from chenghaoyang-low.c.googlers.com.com\n\t(0.223.81.34.bc.googleusercontent.com. [34.81.223.0])\n\tby smtp.gmail.com with ESMTPSA id\n\td9443c01a7336-20794735719sm133857435ad.275.2024.09.23.07.49.29\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 23 Sep 2024 07:49:30 -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=\"WR7ZTuWZ\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1727102971; x=1727707771;\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=DMlc1Dn1eZniccX/UbKrZxGHJppT3wLmphAvDIq2uYg=;\n\tb=WR7ZTuWZM3sD/AjnlbhkriwmvikM2wV/hpcMsNJLvCSdFE0vsfabXR4eRo4lmhpilC\n\tctx5mcwPS5er1TxxGdM6Pw1QarrNMciQcVXJiPOvnqNIkybf16p/sq4KGXdgPv49SH/v\n\tLPhxbf0XkdhNUIK8TYRO74apHF94SXduxziUM=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1727102971; x=1727707771;\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=DMlc1Dn1eZniccX/UbKrZxGHJppT3wLmphAvDIq2uYg=;\n\tb=qFOvksne1DcZjomEMgiAXAPxgDyuHXb4y31yu+QUCdomYPJPUyNCgpGfPMbHPiynus\n\tYiXbymSrttfXu1UuFpfKsw3CmSNWgBq4jHxdSA/5UHgqrC5djed9dwvCLfGLdQ8mYZ/v\n\tFXwBXLK7h+5i1s52LPyysxkDjjuo7NncT8huJ+lCziU4j+ldxo4O7M3RvzmaDoFC3xUf\n\tPrxWm8XeqmSbHsLJ+xXNNJPQrYspxbX1FXBbRA4a9jrx68/kbzMoayHwxNYFPWQgpLk+\n\tyn/wzeWidjO4romoNMcfD+KiKsMprP7TePYl/Y2Xq/WruDrQgeALMqltm7itivFZ0wZO\n\tchpg==", "X-Gm-Message-State": "AOJu0Yzh6+58EY19J57o9Mx2KPJvP8ZfNafDeX1DBfK8cHZ5H4uj3tFy\n\t27hc5H5QAegpFene22PVsv8HjxsmaR7QAyXQwqw60tv0ZLGGPgjI5tl4sm+IK8g8V+Hd31y0JZs\n\t=", "X-Google-Smtp-Source": "AGHT+IG0g0F1KcdLO0Qm6WSZaCmCXbWKOEYEp/b/9jGomgP6aR75w0qjLyW3/tKDGtu2WlYq0uHbAQ==", "X-Received": "by 2002:a05:6a21:1583:b0:1d3:2928:f167 with SMTP id\n\tadf61e73a8af0-1d32928f277mr6294076637.42.1727102970912; \n\tMon, 23 Sep 2024 07:49:30 -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\tbecker hsieh <beckerh@chromium.org>,\n\tHarvey Yang <chenghaoyang@chromium.org>", "Subject": "[PATCH v6 2/3] libcamera: Add face detection controls", "Date": "Mon, 23 Sep 2024 14:45:04 +0000", "Message-ID": "<20240923144921.1729183-3-chenghaoyang@google.com>", "X-Mailer": "git-send-email 2.46.0.792.g87dc391469-goog", "In-Reply-To": "<20240923144921.1729183-1-chenghaoyang@google.com>", "References": "<20240923144921.1729183-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\nAdd FaceDetectMode, FaceDetectFaceRectangles, FaceDetectFaceScores,\nand FaceDetectFaceLandmark. Also add ControlTypePoint for supporting\nFaceDetectFaceLandmark.\n\nSigned-off-by: Yudhistira Erlandinata <yerlandinata@chromium.org>\nCo-developed-by: becker hsieh <beckerh@chromium.org>\nCo-developed-by: Harvey Yang <chenghaoyang@chromium.org>\n---\n include/libcamera/controls.h | 6 ++\n include/libcamera/meson.build | 3 +-\n src/libcamera/control_ids_android.yaml | 98 ++++++++++++++++++++++++++\n src/libcamera/control_ranges.yaml | 1 +\n src/libcamera/controls.cpp | 6 ++\n 5 files changed, 113 insertions(+), 1 deletion(-)\n create mode 100644 src/libcamera/control_ids_android.yaml", "diff": "diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\nindex 7c2bb287..bf1b8609 100644\n--- a/include/libcamera/controls.h\n+++ b/include/libcamera/controls.h\n@@ -34,6 +34,7 @@ enum ControlType {\n \tControlTypeString,\n \tControlTypeRectangle,\n \tControlTypeSize,\n+\tControlTypePoint,\n };\n \n namespace details {\n@@ -87,6 +88,11 @@ struct control_type<Size> {\n \tstatic constexpr ControlType value = ControlTypeSize;\n };\n \n+template<>\n+struct control_type<Point> {\n+\tstatic constexpr ControlType value = ControlTypePoint;\n+};\n+\n template<typename T, std::size_t N>\n struct control_type<Span<T, N>> : public control_type<std::remove_cv_t<T>> {\n };\ndiff --git a/include/libcamera/meson.build b/include/libcamera/meson.build\nindex a969a95d..4fff14d2 100644\n--- a/include/libcamera/meson.build\n+++ b/include/libcamera/meson.build\n@@ -34,6 +34,7 @@ libcamera_headers_install_dir = get_option('includedir') / libcamera_include_dir\n \n controls_map = {\n 'controls': {\n+ 'android': 'control_ids_android.yaml',\n 'draft': 'control_ids_draft.yaml',\n 'core': 'control_ids_core.yaml',\n 'rpi/vc4': 'control_ids_rpi.yaml',\n@@ -55,7 +56,7 @@ foreach mode, entry : controls_map\n files_list = []\n input_files = []\n foreach vendor, header : entry\n- if vendor != 'core' and vendor != 'draft'\n+ if vendor != 'core' and vendor != 'draft' and vendor != 'android'\n if vendor not in pipelines\n continue\n endif\ndiff --git a/src/libcamera/control_ids_android.yaml b/src/libcamera/control_ids_android.yaml\nnew file mode 100644\nindex 00000000..8b0d624f\n--- /dev/null\n+++ b/src/libcamera/control_ids_android.yaml\n@@ -0,0 +1,98 @@\n+# SPDX-License-Identifier: LGPL-2.1-or-later\n+#\n+# Copyright (C) 2024, Google Inc.\n+#\n+%YAML 1.1\n+---\n+# Unless otherwise stated, all controls are bi-directional, i.e. they can be\n+# set through Request::controls() and returned out through Request::metadata().\n+vendor: android\n+controls:\n+ - FaceDetectMode:\n+ type: uint8_t\n+ description: |\n+ Reporting mode of face detection.\n+\n+ Currently identical to ANDROID_STATISTICS_FACE_DETECT_MODE.\n+\n+ \\sa FaceDetectFaceRectangles\n+ \\sa FaceDetectFaceScores\n+ \\sa FaceDetectFaceLandmarks\n+ \\sa FaceDetectFaceIds\n+\n+ enum:\n+ - name: FaceDetectModeOff\n+ value: 0\n+ description: |\n+ Pipeline should not report face detection result.\n+ - name: FaceDetectModeSimple\n+ value: 1\n+ description: |\n+ Pipeline should at least report FaceDetectFaceRectangles and\n+ FaceDetectFaceScores for each detected faces.\n+ FaceDetectFaceLandmarks and FaceDetectFaceIds is optional.\n+\n+ - name: FaceDetectModeFull\n+ value: 2\n+ description: |\n+ Pipeline should report all face controls, including\n+ FaceDetectFaceRectangles, FaceDetectFaceScores,\n+ FaceDetectFaceLandmarks, and FaceDeteceFaceIds.\n+\n+ - FaceDetectFaceRectangles:\n+ type: Rectangle\n+ description: |\n+ Boundary rectangles of the detected faces.\n+ The number of values should be the number of faces reported in\n+ FaceDetectFaceRectangles.\n+\n+ The FaceDetectFaceRectangles control can only be returned in metadata.\n+\n+ Currently identical to ANDROID_STATISTICS_FACE_RECTANGLES.\n+\n+ size: [n]\n+\n+ - FaceDetectFaceScores:\n+ type: uint8_t\n+ description: |\n+ Confidence score of each of the detected faces by face detector.\n+ The range of score is [0, 100].\n+ The FaceDetectFaceScores control can only be returned in metadata.\n+ The number of values should be the number of faces reported in\n+ FaceDetectFaceRectangles.\n+\n+ Currently identical to ANDROID_STATISTICS_FACE_SCORES.\n+\n+ size: [n]\n+\n+ - FaceDetectFaceLandmarks:\n+ type: Point\n+ description: |\n+ Array of human face landmark coordinates in format:\n+ [..., left_eye_i, right_eye_i, mouth_i, left_eye_i+1, ...],\n+ with i = index of face.\n+ The number of values should be 3 * the number of faces reported in\n+ FaceDetectFaceRectangles.\n+\n+ The FaceDetectFaceLandmarks control can only be returned in metadata.\n+\n+ Currently identical to ANDROID_STATISTICS_FACE_LANDMARKS.\n+\n+ size: [n]\n+\n+ - FaceDetectFaceIds:\n+ type: int32_t\n+ description: |\n+ Each detected face is given a unique ID that is valid for as long as\n+ the face is visible to the camera device. A face that leaves the field\n+ of view and later returns may be assigned a new ID.\n+ The number of values should be the number of faces reported in\n+ FaceDetectFaceRectangles.\n+\n+ The FaceDetectFaceIds control can only be returned in metadata.\n+\n+ Currently identical to ANDROID_STATISTICS_FACE_IDS.\n+\n+ size: [n]\n+\n+...\ndiff --git a/src/libcamera/control_ranges.yaml b/src/libcamera/control_ranges.yaml\nindex d42447d0..5c6ca414 100644\n--- a/src/libcamera/control_ranges.yaml\n+++ b/src/libcamera/control_ranges.yaml\n@@ -14,5 +14,6 @@ ranges:\n # Raspberry Pi vendor controls\n rpi: 20000\n # Next range starts at 30000\n+ android: 30000\n \n ...\ndiff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\nindex dba74404..c452e607 100644\n--- a/src/libcamera/controls.cpp\n+++ b/src/libcamera/controls.cpp\n@@ -60,6 +60,7 @@ static constexpr size_t ControlValueSize[] = {\n \t[ControlTypeString]\t\t= sizeof(char),\n \t[ControlTypeRectangle]\t\t= sizeof(Rectangle),\n \t[ControlTypeSize]\t\t= sizeof(Size),\n+\t[ControlTypePoint]\t\t= sizeof(Point),\n };\n \n } /* namespace */\n@@ -254,6 +255,11 @@ std::string ControlValue::toString() const\n \t\t\tstr += value->toString();\n \t\t\tbreak;\n \t\t}\n+\t\tcase ControlTypePoint: {\n+\t\t\tconst Point *value = reinterpret_cast<const Point *>(data);\n+\t\t\tstr += value->toString();\n+\t\t\tbreak;\n+\t\t}\n \t\tcase ControlTypeNone:\n \t\tcase ControlTypeString:\n \t\t\tbreak;\n", "prefixes": [ "v6", "2/3" ] }