From patchwork Fri Aug 30 21:00:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harvey Yang X-Patchwork-Id: 21126 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 0FB1BC32C2 for ; Fri, 30 Aug 2024 21:03:25 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id DB1C263471; Fri, 30 Aug 2024 23:03:21 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="m6j3JRmx"; dkim-atps=neutral Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6002C61E4A for ; Fri, 30 Aug 2024 23:03:17 +0200 (CEST) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-42bbbff40bbso8872195e9.2 for ; Fri, 30 Aug 2024 14:03:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1725051797; x=1725656597; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=r/I/asyNDPgFivOcw3MnOP+duUL4cdodULyhKmUniNk=; b=m6j3JRmxFh9hBxvmBID2Q62NkbQyo8qFwhtXaWSQq1zOM6fdvo27KnI+HdaydE8IGZ 7WhAM9dHSvsxzzn/jSg54TMbDbA5VPmKhm04aVN9hwoHDgmRKRvR+W8DaoqNBFT6kvW+ WHSgu2a4tuPM6HPF1o7NW6MyolUUaxxBVbaLU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725051797; x=1725656597; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r/I/asyNDPgFivOcw3MnOP+duUL4cdodULyhKmUniNk=; b=T881DNY8IjZfxULXy+rFPX61psQBKxy0V9t4fhNPYcEfULcAr+7hx1X01xyI09wD2t EmNiW2+unHH2PyzuzbzIHwYREl0kUPLrKk5HajWWf2p8Bus8pY9cZiGs+H2+RQ4Bf0wJ WKHq+sJpSrB7to8lkvLVJS0PifwlKcjEDH5tlwUM7S/oJ2fYX2ttFEfdYFH5/3sfjRi+ O0pCXZBNEQGgvToZvb0he2pPQM1bD8MfeG2yn/dRmggtPmRTV/LGp0E0cUuFrxUPMkgJ iqQcyF5TaqMwWv7R1UybqMN7Q1pff65vLwJuCaXqL2l8ggxABVDZ/0f5fDfIhWaX0ThS fsow== X-Gm-Message-State: AOJu0YxM03ZAWI9hZh+06V3/LjwUJJMdeBIlb4JD2XcX4/6hyz4eZQ7v denRmxrKJ/aaY2p7YlilPrrhra4OYTIh/CO/MPKKy4Qv+cioPrtjyX4OlEpzSYzYvlPYKqYEiWh 8tA== X-Google-Smtp-Source: AGHT+IHQznniGc0rKRGuRGQJriVB6WM6hAcyb1WL+lJJ5+TMXFOxA7Q0kNLyhnf45BpaF37XaNM+gg== X-Received: by 2002:a05:600c:1c9e:b0:426:61af:e1d6 with SMTP id 5b1f17b1804b1-42bbb44023emr24955075e9.29.1725051796598; Fri, 30 Aug 2024 14:03:16 -0700 (PDT) Received: from chenghaoyang-germany.c.googlers.com.com (161.126.77.34.bc.googleusercontent.com. [34.77.126.161]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3749efb37efsm4935529f8f.109.2024.08.30.14.03.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 14:03:16 -0700 (PDT) From: Harvey Yang To: libcamera-devel@lists.libcamera.org Cc: Yudhistira Erlandinata , becker hsieh , Harvey Yang Subject: [PATCH v3 2/3] libcamera: Add face detection controls Date: Fri, 30 Aug 2024 21:00:20 +0000 Message-ID: <20240830210313.30691-3-chenghaoyang@chromium.org> X-Mailer: git-send-email 2.46.0.469.g59c65b2a67-goog In-Reply-To: <20240830210313.30691-1-chenghaoyang@chromium.org> References: <20240830210313.30691-1-chenghaoyang@chromium.org> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Yudhistira Erlandinata Add FaceDetectMode, FaceDetectFaceRectangles, FaceDetectFaceScores, and FaceDetectFaceLandmark. Also add ControlTypePoint for supporting FaceDetectFaceLandmark. Signed-off-by: Yudhistira Erlandinata Co-developed-by: becker hsieh Co-developed-by: Harvey Yang --- include/libcamera/controls.h | 6 +++ src/libcamera/control_ids_draft.yaml | 63 ++++++++++++++++++++++++++++ src/libcamera/controls.cpp | 6 +++ 3 files changed, 75 insertions(+) diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index 7c2bb2872..bf1b8609c 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -34,6 +34,7 @@ enum ControlType { ControlTypeString, ControlTypeRectangle, ControlTypeSize, + ControlTypePoint, }; namespace details { @@ -87,6 +88,11 @@ struct control_type { static constexpr ControlType value = ControlTypeSize; }; +template<> +struct control_type { + static constexpr ControlType value = ControlTypePoint; +}; + template struct control_type> : public control_type> { }; diff --git a/src/libcamera/control_ids_draft.yaml b/src/libcamera/control_ids_draft.yaml index 9bef5bf15..23e09bff8 100644 --- a/src/libcamera/control_ids_draft.yaml +++ b/src/libcamera/control_ids_draft.yaml @@ -227,4 +227,67 @@ controls: value. All of the custom test patterns will be static (that is the raw image must not vary from frame to frame). + - FaceDetectMode: + type: uint8_t + description: | + Reporting mode of face detection. + + enum: + - name: FaceDetectModeOff + value: 0 + description: | + Pipeline should not report face detection result. + - name: FaceDetectModeSimple + value: 1 + description: | + Pipeline should at least report faces boundary rectangles, in + metadata FaceDetectFaceRectangles, and confidence score, + in metadata FaceDetectFaceScores, for each of them. + FaceDetectFaceLandmark is optional. + + The number of faces in each list must be the same. + + \sa FaceDetectFaceRectangles + \sa FaceDetectFaceScores + \sa FaceDetectFaceLandmark + + - FaceDetectFaceRectangles: + type: Rectangle + description: | + Boundary rectangle of the detected faces in format: + [..., xmin_i, ymin_i, xmax_i, ymax_i, ...], where (0,0) is top-left + of active pixel area. + The number of values should be 3 * the number of faces. + + The FaceDetectFaceRectangles control can only be returned in metadata. + + size: [n] + + - FaceDetectFaceScores: + type: uint8_t + description: | + Confidence score of each of the detected faces by face detector. + The range of score is [0, 100]. + The FaceDetectFaceScores control can only be returned in metadata. + The number of values should be the number of faces. + + Currently identical to ANDROID_STATISTICS_FACE_SCORES. + + size: [n] + + - FaceDetectFaceLandmark: + type: Point + description: | + Array of human face landmark coordinates in format: + [..., left_eye_i, right_eye_i, mouth_i, left_eye_i+1, ...], + with i = index of face. + The number of values should be 6 * the number of faces. + + The FaceDetectFaceLandmark control can only be returned in metadata. + + Currently identical to ANDROID_STATISTICS_FACE_LANDMARKS. + + size: [n] + + ... diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp index 11d35321c..ce73ae9d7 100644 --- a/src/libcamera/controls.cpp +++ b/src/libcamera/controls.cpp @@ -61,6 +61,7 @@ static constexpr size_t ControlValueSize[] = { [ControlTypeString] = sizeof(char), [ControlTypeRectangle] = sizeof(Rectangle), [ControlTypeSize] = sizeof(Size), + [ControlTypePoint] = sizeof(Point), }; } /* namespace */ @@ -255,6 +256,11 @@ std::string ControlValue::toString() const str += value->toString(); break; } + case ControlTypePoint: { + const Point *value = reinterpret_cast(data); + str += value->toString(); + break; + } case ControlTypeNone: case ControlTypeString: break;