{"id":21345,"url":"https://patchwork.libcamera.org/api/1.1/patches/21345/?format=json","web_url":"https://patchwork.libcamera.org/patch/21345/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20240924110353.2025397-4-chenghaoyang@google.com>","date":"2024-09-24T11:02:46","name":"[v7,3/3] libcamera: android: Add face detection control support","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"ac61a81169388d998c8a7e1e2c3d389ad9391a8a","submitter":{"id":117,"url":"https://patchwork.libcamera.org/api/1.1/people/117/?format=json","name":"Cheng-Hao Yang","email":"chenghaoyang@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21345/mbox/","series":[{"id":4618,"url":"https://patchwork.libcamera.org/api/1.1/series/4618/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4618","date":"2024-09-24T11:02:43","name":"Add Face Detection Controls","version":7,"mbox":"https://patchwork.libcamera.org/series/4618/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21345/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21345/checks/","tags":{},"headers":{"Return-Path":"","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 3E550C32D4\n\tfor ;\n\tTue, 24 Sep 2024 11:04:11 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A01AA63512;\n\tTue, 24 Sep 2024 13:04:10 +0200 (CEST)","from mail-pf1-x433.google.com (mail-pf1-x433.google.com\n\t[IPv6:2607:f8b0:4864:20::433])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 89D3A63515\n\tfor ;\n\tTue, 24 Sep 2024 13:04:05 +0200 (CEST)","by mail-pf1-x433.google.com with SMTP id\n\td2e1a72fcca58-718d6ad6050so3931280b3a.0\n\tfor ;\n\tTue, 24 Sep 2024 04:04:05 -0700 (PDT)","from chenghaoyang-low.c.googlers.com.com\n\t(208.158.221.35.bc.googleusercontent.com. [35.221.158.208])\n\tby smtp.gmail.com with ESMTPSA id\n\td2e1a72fcca58-71afc9833c3sm993326b3a.182.2024.09.24.04.04.01\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 24 Sep 2024 04:04:03 -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=\"L8IUGEpz\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1727175844; x=1727780644;\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=BBYIDOTmFw8r0qJaHkYpTkkfYv9NhuFdtJGkrKUY5TI=;\n\tb=L8IUGEpzFBpV2XzXDjDNsKa97jEB8ABfCaJ/+gZFv+zUcQSxDiz1Hin9m553mWdrtQ\n\tYo+DjFze4LrpiqDSuOZSyG5aTcGPyZpiKIddXUokqhmqNwnHOxk5mAXJiUG5oPyx+Q/+\n\tpVuQ9Dtvln2Y07Dcc4t4ahRF8N5aijzlXLUBM=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1727175844; x=1727780644;\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=BBYIDOTmFw8r0qJaHkYpTkkfYv9NhuFdtJGkrKUY5TI=;\n\tb=ixkUEbsdlEm6NIcnLvVdLmZ2gd9XjnhDRuwO91T+TkgxJy/Bk0XeINtE7O3CIBSoV4\n\tV1RvU9X7dwT02w59rJc8YB1a1SitkN74YQmzyIRfWBO2oCVI2aciP9snJ5OKWJNxpxid\n\tpyL3Nrvn9ArUgsNzszsQZ0AymdRfn3J5cJrmlx7y6MPpgiRdzfFyZcmQb3KVG73lL6cL\n\t6rko2yZ0mhzt9TtioLhV4IxRFMYd0q7UGZYiaOCyPR9/WYr/x/NMjBZGWj/9PjKTfQ+8\n\tVQLjc8y8X3pvTzVSqfrTVBRv/Dr7ONeelAdOfF0kCQQBB3Owk591ike+xAkUSu7roXDB\n\tU3Ow==","X-Gm-Message-State":"AOJu0Yxu+KeXSlvq4Gc+FilqxophPbjz56+wTBVantkYjigm+hXA1Mps\n\tEsXzw1htTFpz7kLsi6kgjopOFV8bQiPj/IyBSlsUFkj9TJN7xQC8Pv6MQlWVUoRBm5lr+x3ClJ0\n\t=","X-Google-Smtp-Source":"AGHT+IHGxkzGqX3jAyLqjY6/uBOHXHKy2YN4yFmL8sPlSehS69zefcGvduFZhabDsEhyTpk3ox72JQ==","X-Received":"by 2002:a05:6a00:b92:b0:70d:21d9:e2ae with SMTP id\n\td2e1a72fcca58-7199c9393d1mr24946490b3a.6.1727175843451; \n\tTue, 24 Sep 2024 04:04:03 -0700 (PDT)","From":"Harvey Yang ","X-Google-Original-From":"Harvey Yang ","To":"libcamera-devel@lists.libcamera.org","Cc":"Harvey Yang ,\n\tYudhistira Erlandinata ","Subject":"[PATCH v7 3/3] libcamera: android: Add face detection control\n\tsupport","Date":"Tue, 24 Sep 2024 11:02:46 +0000","Message-ID":"<20240924110353.2025397-4-chenghaoyang@google.com>","X-Mailer":"git-send-email 2.46.0.792.g87dc391469-goog","In-Reply-To":"<20240924110353.2025397-1-chenghaoyang@google.com>","References":"<20240924110353.2025397-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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Harvey Yang \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 \nCo-developed-by: Harvey Yang \n---\n src/android/camera_capabilities.cpp | 45 ++++++++++++++++--\n src/android/camera_device.cpp | 73 ++++++++++++++++++++++++++++-\n 2 files changed, 112 insertions(+), 6 deletions(-)","diff":"diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\nindex 71043e12..d52d58ed 100644\n--- a/src/android/camera_capabilities.cpp\n+++ b/src/android/camera_capabilities.cpp\n@@ -7,6 +7,8 @@\n \n #include \"camera_capabilities.h\"\n \n+#include \n+\n #include \n #include \n #include \n@@ -1176,11 +1178,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::android::FaceDetectMode.id());\n+\tif (iter != camera_->controls().end()) {\n+\t\tconst ControlInfo &faceDetectCtrlInfo = iter->second;\n+\t\tstd::vector faceDetectModes;\n+\t\tbool hasFaceDetection = false;\n+\n+\t\tfor (const auto &value : faceDetectCtrlInfo.values()) {\n+\t\t\tuint8_t mode = value.get();\n+\t\t\tuint8_t androidMode = 0;\n+\n+\t\t\tswitch (mode) {\n+\t\t\tcase controls::android::FaceDetectModeOff:\n+\t\t\t\tandroidMode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;\n+\t\t\t\tbreak;\n+\t\t\tcase controls::android::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 493f66e7..1982509d 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -15,6 +15,7 @@\n #include \n \n #include \n+#include \n #include \n #include \n \n@@ -22,6 +23,7 @@\n #include \n #include \n #include \n+#include \n #include \n \n #include \"system/graphics.h\"\n@@ -813,6 +815,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::android::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 +1547,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 +1588,67 @@ 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::android::FaceDetectFaceRectangles);\n+\tif (faceDetectRectangles) {\n+\t\tconst Span rectangles = *faceDetectRectangles;\n+\t\tstd::vector 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::android::FaceDetectFaceScores);\n+\tif (faceDetectRectangles && faceDetectFaceScores) {\n+\t\tconst Span &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::android::FaceDetectFaceLandmarks);\n+\tif (faceDetectRectangles && faceDetectFaceLandmarks) {\n+\t\tconst auto &landmarks = *faceDetectFaceLandmarks;\n+\t\tsize_t expectedLandmarks = faceDetectRectangles->size() * 3;\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+\n+\t\tstd::vector 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}\n+\n+\tconst auto &faceDetectFaceIds =\n+\t\tmetadata.get(controls::android::FaceDetectFaceIds);\n+\tif (faceDetectRectangles && faceDetectFaceIds) {\n+\t\tconst Span &ids = *faceDetectFaceIds;\n+\t\tif (ids.size() != faceDetectRectangles->size()) {\n+\t\t\tLOG(HAL, Error) << \"Pipeline returned wrong number of face ids; \"\n+\t\t\t\t\t<< \"Expected: \"\n+\t\t\t\t\t<< faceDetectRectangles->size()\n+\t\t\t\t\t<< \", got: \" << ids.size();\n+\t\t}\n+\t\tresultMetadata->addEntry(ANDROID_STATISTICS_FACE_IDS, ids);\n+\t}\n+\n \tconst auto &scalerCrop = metadata.get(controls::ScalerCrop);\n \tif (scalerCrop) {\n \t\tconst Rectangle &crop = *scalerCrop;\n","prefixes":["v7","3/3"]}