[{"id":35839,"web_url":"https://patchwork.libcamera.org/comment/35839/","msgid":"<175802102233.103890.9692043984884659514@isaac-ThinkPad-T16-Gen-2>","date":"2025-09-16T11:10:22","subject":"Re: [PATCH v2 4/5] libcamera: Add flash helpers for pipeline\n\thandlers","submitter":{"id":215,"url":"https://patchwork.libcamera.org/api/people/215/","name":"Isaac Scott","email":"isaac.scott@ideasonboard.com"},"content":"Hi Matthias,\n\nThank you for the patch!\n\nQuoting Matthias Fend (2025-09-12 08:13:23)\n> Add a set of helpers that pipeline handlers can use to deal with camera\n> flash devices. This mainly involves mapping controls to the flash device\n> and vice versa.\n> \n> Signed-off-by: Matthias Fend \n> ---\n> include/libcamera/internal/flash_control.h | 23 +++++\n> src/libcamera/flash_control.cpp | 148 +++++++++++++++++++++++++++++\n> src/libcamera/meson.build | 1 +\n> 3 files changed, 172 insertions(+)\n> \n> diff --git a/include/libcamera/internal/flash_control.h b/include/libcamera/internal/flash_control.h\n> new file mode 100644\n> index 0000000000000000000000000000000000000000..d530dc24fd8ea2d5676d95ab5943a7dacee07617\n> --- /dev/null\n> +++ b/include/libcamera/internal/flash_control.h\n> @@ -0,0 +1,23 @@\n> +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> +/*\n> + * Copyright (C) 2025, matthias.fend@emfend.at\n> + *\n> + * Flash controls helpers for pipeline handlers\n> + */\n> +\n> +#pragma once\n> +\n> +#include \n> +\n> +#include \"libcamera/internal/camera_flash.h\"\n> +\n> +namespace libcamera {\n> +\n> +class FlashControl\n> +{\n> +public:\n> + static void updateFlashControls(CameraFlash *flash, ControlInfoMap::Map &controls);\n> + static void handleFlashControls(CameraFlash *flash, ControlList &controls, ControlList &metadata);\n> +};\n\nThis looks good to me!\n\nReviewed-by: Isaac Scott \n\n> +\n> +} /* namespace libcamera */\n> diff --git a/src/libcamera/flash_control.cpp b/src/libcamera/flash_control.cpp\n> new file mode 100644\n> index 0000000000000000000000000000000000000000..0a032b5d50c8c04696aea211f05222357432e7ed\n> --- /dev/null\n> +++ b/src/libcamera/flash_control.cpp\n> @@ -0,0 +1,148 @@\n> +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> +/*\n> + * Copyright (C) 2025, matthias.fend@emfend.at\n> + *\n> + * Flash controls helpers for pipeline handlers\n> + */\n> +\n> +#include \"libcamera/internal/flash_control.h\"\n> +\n> +#include \n> +#include \n> +\n> +namespace libcamera {\n> +\n> +void FlashControl::updateFlashControls(CameraFlash *flash, ControlInfoMap::Map &controls)\n> +{\n> + if (!flash)\n> + return;\n> +\n> + controls[&controls::FlashMode] = ControlInfo(controls::FlashModeValues, controls::FlashModeNone);\n> + controls[&controls::FlashIntensity] = flash->getFlashIntensityInfo();\n> + controls[&controls::FlashTimeout] = flash->getFlashTimeoutInfo();\n> + controls[&controls::FlashStrobeSource] = ControlInfo(controls::FlashStrobeSourceValues, controls::FlashStrobeSourceSoftware);\n> + controls[&controls::FlashStrobe] = ControlInfo(controls::FlashStrobeValues);\n> + controls[&controls::FlashTorchIntensity] = flash->getTorchIntensityInfo();\n> +}\n> +\n> +void FlashControl::handleFlashControls(CameraFlash *flash, ControlList &controls, ControlList &metadata)\n> +{\n> + if (!flash)\n> + return;\n> +\n> + /* Handle controls */\n> +\n> + const auto &flashMode = controls.get(controls::FlashMode);\n> + if (flashMode) {\n> + CameraFlash::Mode mode;\n> +\n> + switch (*flashMode) {\n> + case controls::FlashModeFlash:\n> + mode = CameraFlash::Mode::Flash;\n> + break;\n> + case controls::FlashModeTorch:\n> + mode = CameraFlash::Mode::Torch;\n> + break;\n> + case controls::FlashModeNone:\n> + default:\n> + mode = CameraFlash::Mode::None;\n> + break;\n> + }\n> +\n> + flash->setMode(mode);\n> + }\n> +\n> + const auto &flashIntensity = controls.get(controls::FlashIntensity);\n> + if (flashIntensity)\n> + flash->setFlashIntensity(*flashIntensity);\n> +\n> + const auto &flashTimeout = controls.get(controls::FlashTimeout);\n> + if (flashTimeout)\n> + flash->setFlashTimeout(*flashTimeout);\n> +\n> + const auto &flashStrobeSource = controls.get(controls::FlashStrobeSource);\n> + if (flashStrobeSource) {\n> + CameraFlash::StrobeSource source;\n> +\n> + switch (*flashStrobeSource) {\n> + case controls::FlashStrobeSourceExternal:\n> + source = CameraFlash::StrobeSource::External;\n> + break;\n> + case controls::FlashStrobeSourceSoftware:\n> + default:\n> + source = CameraFlash::StrobeSource::Software;\n> + break;\n> + }\n> +\n> + flash->setStrobeSource(source);\n> + }\n> +\n> + const auto &flashStrobe = controls.get(controls::FlashStrobe);\n> + if (flashStrobe) {\n> + switch (*flashStrobe) {\n> + case controls::FlashStrobeStart:\n> + flash->startStrobe();\n> + break;\n> + case controls::FlashStrobeStop:\n> + flash->stopStrobe();\n> + break;\n> + default:\n> + break;\n> + }\n> + }\n> +\n> + const auto &flashTorchIntensity = controls.get(controls::FlashTorchIntensity);\n> + if (flashTorchIntensity)\n> + flash->setTorchIntensity(*flashTorchIntensity);\n> +\n> + /* Fill metadata */\n> +\n> + const auto metaFlashMode = flash->getMode();\n> + if (metaFlashMode) {\n> + controls::FlashModeEnum mode;\n> +\n> + switch (*metaFlashMode) {\n> + case CameraFlash::Mode::Flash:\n> + mode = controls::FlashModeFlash;\n> + break;\n> + case CameraFlash::Mode::Torch:\n> + mode = controls::FlashModeTorch;\n> + break;\n> + case CameraFlash::Mode::None:\n> + default:\n> + mode = controls::FlashModeNone;\n> + break;\n> + }\n> + metadata.set(controls::FlashMode, mode);\n> + }\n> +\n> + const auto metaFlashIntensity = flash->getFlashIntensity();\n> + if (metaFlashIntensity)\n> + metadata.set(controls::FlashIntensity, *metaFlashIntensity);\n> +\n> + auto metaFlashTimeout = flash->getFlashTimeout();\n> + if (metaFlashTimeout)\n> + metadata.set(controls::FlashTimeout, *metaFlashTimeout);\n> +\n> + auto metaStrobeSource = flash->getStrobeSource();\n> + if (metaStrobeSource) {\n> + controls::FlashStrobeSourceEnum source;\n> +\n> + switch (*metaStrobeSource) {\n> + case CameraFlash::StrobeSource::External:\n> + source = controls::FlashStrobeSourceExternal;\n> + break;\n> + case CameraFlash::StrobeSource::Software:\n> + default:\n> + source = controls::FlashStrobeSourceSoftware;\n> + break;\n> + }\n> + metadata.set(controls::FlashStrobeSource, source);\n> + }\n> +\n> + auto metaTorchIntensity = flash->getTorchIntensity();\n> + if (metaTorchIntensity)\n> + metadata.set(controls::FlashTorchIntensity, *metaTorchIntensity);\n> +}\n> +\n> +} /* namespace libcamera */\n> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\n> index 0f125661a51e2431c1febc353cef30a1219f9ce7..a68a49637db12f9e66b5bb38ee859aaac8c2fd1a 100644\n> --- a/src/libcamera/meson.build\n> +++ b/src/libcamera/meson.build\n> @@ -31,6 +31,7 @@ libcamera_internal_sources = files([\n> 'device_enumerator.cpp',\n> 'device_enumerator_sysfs.cpp',\n> 'dma_buf_allocator.cpp',\n> + 'flash_control.cpp',\n> 'formats.cpp',\n> 'ipa_controls.cpp',\n> 'ipa_data_serializer.cpp',\n> \n> -- \n> 2.34.1\n>","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 2B5C2C328C\n\tfor ;\n\tTue, 16 Sep 2025 11:10:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D722769371;\n\tTue, 16 Sep 2025 13:10:27 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1C769613A1\n\tfor ;\n\tTue, 16 Sep 2025 13:10:26 +0200 (CEST)","from thinkpad.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id DA0886DF;\n\tTue, 16 Sep 2025 13:09:07 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"BtIF6Q8t\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1758020947;\n\tbh=l8GvnEfyJqe4DIpB0eKExSj+no163uy34QcSmwjJHMQ=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=BtIF6Q8t5/QH80o2FE4fEvsRWsFIwzhYMsaGqlLaTHbH5mj4OeC7zyxWNgjRRE0Yx\n\tGSiwJAQecBTBcY4y8IgOU0QOpm7+8H3/sA0/a7UqkvgSwP/yGu2H0YpcK3XCjrnObt\n\tPrONniJM15uGx42jR12Rz4rQE6MyO5rPEuI6AwLc=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20250912-flash_reco-v2-4-d5bb80a2e619@emfend.at>","References":"<20250912-flash_reco-v2-0-d5bb80a2e619@emfend.at>\n\t<20250912-flash_reco-v2-4-d5bb80a2e619@emfend.at>","Subject":"Re: [PATCH v2 4/5] libcamera: Add flash helpers for pipeline\n\thandlers","From":"Isaac Scott ","Cc":"Matthias Fend ","To":"Matthias Fend ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Tue, 16 Sep 2025 12:10:22 +0100","Message-ID":"<175802102233.103890.9692043984884659514@isaac-ThinkPad-T16-Gen-2>","User-Agent":"alot/0.10","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\" "}}]