From patchwork Sun Aug 24 00:48:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 24198 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 BEFD5BEFBE for ; Sun, 24 Aug 2025 00:49:10 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 492956932A; Sun, 24 Aug 2025 02:49:10 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="RBY5tSbM"; dkim-atps=neutral Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 20206692F4 for ; Sun, 24 Aug 2025 02:48:51 +0200 (CEST) Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3c4e9efb88aso1759274f8f.2 for ; Sat, 23 Aug 2025 17:48:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1755996530; x=1756601330; darn=lists.libcamera.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=buyPJiIJKZXiM/HnjpnpDLGVy4LpqFUeppgQojCV8f8=; b=RBY5tSbMgLFXET7H2PtfLHH3vowGzrydzLSMqbJdMdtP4gQmZiwiXzyqIpO3kJpWmx QaF10T1dLeh+VvX5IOVkrp9tcTazJpiseDNDde4Z8FBm5f2KwanrzZQ9dOYV8iP2KKbS PV4xLBVhbo0WabC0LTT8fgyughpViPyGLqAt71KiM8ED5i3BM0/qMXVs2R0YwnjHD88r IFTGi3MgrKLSBxxcoucWXuFE1N0CkhjbDB4w9skowtmN4peRT5kSThkr/FjHv6bML1On sN2vOL3GXlGj7guZQka8XKz+L/SsWSD3n7/JBbv4ZGn906mFnfwR7GdiF5ar5p5I3e6X jb6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755996530; x=1756601330; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=buyPJiIJKZXiM/HnjpnpDLGVy4LpqFUeppgQojCV8f8=; b=lDiXZxEKqGCmJ+nWpykPSuQaO+uqrroywO0e1iBvrhFAn9a2hfJYPhUfh92iWnark5 KSjvlqTHxhszqFlVwDGcjsCZCI4hroZtgVEXwU6bCoavhF3TcyVdowQzUrsZ2YBoKTzF rAnGAub2mHAfRx2lbtbQ8pY2lxTIh21b3rHqjZQtKU9FtLkTcjRqdmsepYAWRU6c/f3a wVb2cgqPIRB9HnQbR7XydA/uiP6BCmdr0+p/t8H9hMq0/FUoS+NfW2highU8QjzTRIFs ua8/f7x6+qcPN9wHRjB1YO9gNx+CB2dKwnvmwpvX73niNPoDo2F3LSp2WZiaWq9Z/BLu Tybg== X-Gm-Message-State: AOJu0YxLCAFSrQ15SM91Qvy4DKgwFWx5ysF4XR7pskYdO4qM/C1nYqke Y03MJB9itKSvZxe0fLgCTFtAhvYstyn7J6TRIf3yE+7tMmM5lsUGIFb35wSaf0Qo+FU= X-Gm-Gg: ASbGncv9V/4TbTpoD7o7nsEMyjEK1OXO4GtE+px9csVCPh1vZ3arzN/uyAENhOCUB+b CIw2WwFRDtgPI3q+YHPA815NLc+V7IPe2NrQdVfTmKDHyyKXqDqX5h+ht7SJ/psCZZudWoLiLqM KSq4pAn61PnMkr136Oz7hCbZWZdmlVfdenvbClYl9W4fESMv6R+zLtORfbK5aJhsLk1F0X2IjH9 06AnHa6jplHL5aERuSYOW0M7slbvs2j8xZHgudYJxHfhK8bsG41sdSwyoMZ5eJdc8IJFrECgHnO KymIFogjatPlcx7o9KVp8O9ZP6Oh5MeYn5SZd5QtaLvuduJSvFtg6EsdoeI1nGQsOvBYE8LibHO zwRSx/aLJYa0CL2YlvV+sk6d+d8VT6Xgs2P3diSXaKym+cnwkJhWj4C/Oamqk3GHCv0xe1nMQDS upYvkCfPJQmg1f3AySq8FM X-Google-Smtp-Source: AGHT+IFdn/1fN2eF5MPZ7muvVg4a/iHUokPPieTHyJy4LpgdSzufLYQq18NIf1ZbPniZxEwrH5kKjA== X-Received: by 2002:a05:600c:45d0:b0:459:e025:8c5a with SMTP id 5b1f17b1804b1-45b517d4b94mr71758495e9.33.1755996530576; Sat, 23 Aug 2025 17:48:50 -0700 (PDT) Received: from [192.168.0.13] (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b4e1d530esm69347225e9.0.2025.08.23.17.48.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Aug 2025 17:48:50 -0700 (PDT) From: Bryan O'Donoghue Date: Sun, 24 Aug 2025 01:48:28 +0100 Subject: [PATCH v2 16/37] libcamera: software_isp: debayer: Introduce a stop() callback to the debayer object MIME-Version: 1.0 Message-Id: <20250824-b4-v0-5-2-gpuisp-v2-a-v2-16-96f4576c814e@linaro.org> References: <20250824-b4-v0-5-2-gpuisp-v2-a-v2-0-96f4576c814e@linaro.org> In-Reply-To: <20250824-b4-v0-5-2-gpuisp-v2-a-v2-0-96f4576c814e@linaro.org> To: libcamera-devel@lists.libcamera.org Cc: Bryan O'Donoghue X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1785; i=bryan.odonoghue@linaro.org; h=from:subject:message-id; bh=Zoj/84VUy61EbRwVaSQZKyt7j6W8BL9rD4a7kpxc2TY=; b=owEBbQKS/ZANAwAKASJxO7Ohjcg6AcsmYgBoqmFf6iqPFJTnJR58QTPrrv5gQpia+YZFe9hDn PeBdIUyUReJAjMEAAEKAB0WIQTmk/sqq6Nt4Rerb7QicTuzoY3IOgUCaKphXwAKCRAicTuzoY3I OrnmEACiTMVlr6jfHHyujv8bUETtxx6jhjTzYzauXmnqtx+nZ02FQzT+uejFLdTHtBFQlSv0Fc+ LHcOij86C1LeDP5KUYjTbZyNaEiXcPHh8vSSu6Mc1jCZ3Q325bTk5gUz6eJZUJCGmGnPfq241kt IHsedtUvCMknsQWgQbwwiM2eXQITte+8WV02Bww/fe++yNu1NDibG6yuMaUn6b3UAFNsgJvrWL9 wMVU0MG616ygbMGud25IyNkaHGGrJjhjLGWVQ0eNGhXIh2L/TTfEHMk2mfmphX5+fG5yhhg9fxA DR0NuM4hl7eswbCOPrs5W4mRqgfXxnoymIByl5VV8l/9ByS6Pks4dlwpEGxtc+fNQXI7uZuis7G qHn19+T7kh9oOo8jls7DsGrdeWudrgTvWtfocj8Kc/i/lqpawieoiyVIOrgzVYtL/pIvJ/a+ec6 +XCwDpw2HyqpmV02WLfTt+Dkj30hFC+WmXd24orYImb6ll8uoXa5+0I+RsQgsVIgL6LzWjga7uF jSsEFo6lr6N7oJ2wRtxGxBfmUNWwKtfgKNYE7ZTAXCx3oVz4mVpaALuMutIuhJjk6llc3mY/itn 3jl4OSPEYZlb4EKN6iZE9t5mSGSvaGV5T6WKrEyZOb2TihaZASbMW1qy/M4/dMhfx2Y/IibI9OB 1ro7yTSbFCUY8eg== X-Developer-Key: i=bryan.odonoghue@linaro.org; a=openpgp; fpr=E693FB2AABA36DE117AB6FB422713BB3A18DC83A 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" The eGL class wants to be able to teardown its sync_ data member properly but, doing so in the destructor means we can't make the eGL context current and thus can't tear down the sync primitive properly. Introduce a stop() method to the debayer class which triggers from the softisp's stop method, allowing a controlled and appropriate tear-down of debayer-egl and egl class related data well before the destructors get invoked. Signed-off-by: Bryan O'Donoghue --- src/libcamera/software_isp/debayer.h | 1 + src/libcamera/software_isp/software_isp.cpp | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/libcamera/software_isp/debayer.h b/src/libcamera/software_isp/debayer.h index 214bcdd3c535bae7851d6e0221ba68c19785507d..352ffb89ad9d5a32ed1bbb14253af5e3f21d508c 100644 --- a/src/libcamera/software_isp/debayer.h +++ b/src/libcamera/software_isp/debayer.h @@ -47,6 +47,7 @@ public: strideAndFrameSize(const PixelFormat &outputFormat, const Size &size) = 0; virtual void process(uint32_t frame, FrameBuffer *input, FrameBuffer *output, DebayerParams params) = 0; + void stop() {} virtual SizeRange sizes(PixelFormat inputFormat, const Size &inputSize) = 0; diff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp index e8fa8a17a11c63ebab1338a90df204f4a888c4d6..e6bf76f214280194bc20aaaed4b5bc96598436fb 100644 --- a/src/libcamera/software_isp/software_isp.cpp +++ b/src/libcamera/software_isp/software_isp.cpp @@ -363,6 +363,9 @@ int SoftwareIsp::start() */ void SoftwareIsp::stop() { + debayer_->invokeMethod(&Debayer::stop, + ConnectionTypeQueued); + ispWorkerThread_.exit(); ispWorkerThread_.wait();