From patchwork Fri Apr 8 10:54:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 15660 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 3EAAEC3256 for ; Fri, 8 Apr 2022 10:54:54 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id EC9C865642; Fri, 8 Apr 2022 12:54:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1649415293; bh=UrhIKJUSz5EYhFtmJVv08sfpRLBg6OyK/RyVq/JNZx4=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=i3E5XvWeuvQli7PfSyi2p5bl4aSGqLiDZXSQRDKmoGEO9+bB1511599JALxgW8mhk kMnvnuKmCAlbxxCp36umJ7Qtp5IqL/JYrbxVRYAcxZ0Xri+ZNS4kj5FOsSXIc6zhVu /xRS7mNNiyxNwW34OiO3lkucHZESKjX42t6Zf6eqLRR11+h022kAiMSIxrHMY1okDL mEaw37oDBRmElzusEK5WrJ/OFlL+66LcNp40rmZha3mFtS26JR3vpQHJEhBKutF93C suV6IoSIcQN3Wb3IkYL7ZM3lFWCp7pHu5w/4UJ+gxv1d4zs1fYySDoDMUQa3/0oIFW iYA4VmvTggRvA== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E50EF65640 for ; Fri, 8 Apr 2022 12:54:51 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="ELxMtUXh"; dkim-atps=neutral Received: from perceval.ideasonboard.com (unknown [27.57.186.178]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id EE48A499; Fri, 8 Apr 2022 12:54:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1649415291; bh=UrhIKJUSz5EYhFtmJVv08sfpRLBg6OyK/RyVq/JNZx4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ELxMtUXhGqzO56BO5Sfh3KZ4mPd0aBi3hCckI7LtdAjCbXgAWsLLjJHm/QGM+ZUoc vzAJc54XfZ64Ap8Kfia8F4zLNo2q6nJZ76avJUJ5nvx18d7Z3Qjvtf/npcgGzcKrv6 5o2nA7DX6iV9vHYbvn4eXOn2p6cMKIR74twvWMas= To: libcamera-devel@lists.libcamera.org Date: Fri, 8 Apr 2022 16:24:39 +0530 Message-Id: <20220408105439.144182-3-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220408105439.144182-1-umang.jain@ideasonboard.com> References: <20220408105439.144182-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/2] ipa: vimc: Synchronise parameter buffer ops naming 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: , X-Patchwork-Original-From: Umang Jain via libcamera-devel From: Umang Jain Reply-To: Umang Jain Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Synchronise the names of the operations with respect to parameters buffer with the names used in other IPA interfaces. Signed-off-by: Umang Jain Reviewed-by: Kieran Bingham --- include/libcamera/ipa/vimc.mojom | 4 ++-- src/ipa/vimc/vimc.cpp | 6 +++--- src/libcamera/pipeline/vimc/vimc.cpp | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/libcamera/ipa/vimc.mojom b/include/libcamera/ipa/vimc.mojom index cdc03ffb..718b9674 100644 --- a/include/libcamera/ipa/vimc.mojom +++ b/include/libcamera/ipa/vimc.mojom @@ -37,9 +37,9 @@ interface IPAVimcInterface { * interface functions that mimick how other pipeline handlers typically * handle parameters at runtime. */ - [async] fillParams(uint32 frame, uint32 bufferId); + [async] fillParamsBuffer(uint32 frame, uint32 bufferId); }; interface IPAVimcEventInterface { - paramsFilled(uint32 bufferId); + paramsBufferReady(uint32 bufferId); }; diff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp index a62e72b0..85afb279 100644 --- a/src/ipa/vimc/vimc.cpp +++ b/src/ipa/vimc/vimc.cpp @@ -44,7 +44,7 @@ public: void unmapBuffers(const std::vector &ids) override; void queueRequest(uint32_t frame, const ControlList &controls) override; - void fillParams(uint32_t frame, uint32_t bufferId) override; + void fillParamsBuffer(uint32_t frame, uint32_t bufferId) override; private: void initTrace(); @@ -134,7 +134,7 @@ void IPAVimc::queueRequest([[maybe_unused]] uint32_t frame, { } -void IPAVimc::fillParams([[maybe_unused]] uint32_t frame, uint32_t bufferId) +void IPAVimc::fillParamsBuffer([[maybe_unused]] uint32_t frame, uint32_t bufferId) { auto it = buffers_.find(bufferId); if (it == buffers_.end()) { @@ -142,7 +142,7 @@ void IPAVimc::fillParams([[maybe_unused]] uint32_t frame, uint32_t bufferId) return; } - paramsFilled.emit(bufferId); + paramsBufferReady.emit(bufferId); } void IPAVimc::initTrace() diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp index 69b83d07..fff95a34 100644 --- a/src/libcamera/pipeline/vimc/vimc.cpp +++ b/src/libcamera/pipeline/vimc/vimc.cpp @@ -53,7 +53,7 @@ public: int init(); int allocateMockIPABuffers(); void bufferReady(FrameBuffer *buffer); - void paramsFilled(unsigned int id); + void paramsBufferReady(unsigned int id); MediaDevice *media_; std::unique_ptr sensor_; @@ -467,7 +467,7 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator) return false; } - data->ipa_->paramsFilled.connect(data.get(), &VimcCameraData::paramsFilled); + data->ipa_->paramsBufferReady.connect(data.get(), &VimcCameraData::paramsBufferReady); std::string conf = data->ipa_->configurationFile("vimc.conf"); data->ipa_->init(IPASettings{ conf, data->sensor_->model() }); @@ -589,7 +589,7 @@ void VimcCameraData::bufferReady(FrameBuffer *buffer) pipe->completeBuffer(request, buffer); pipe->completeRequest(request); - ipa_->fillParams(request->sequence(), mockIPABufs_[0]->cookie()); + ipa_->fillParamsBuffer(request->sequence(), mockIPABufs_[0]->cookie()); } int VimcCameraData::allocateMockIPABuffers() @@ -607,7 +607,7 @@ int VimcCameraData::allocateMockIPABuffers() return video_->exportBuffers(kBufCount, &mockIPABufs_); } -void VimcCameraData::paramsFilled([[maybe_unused]] unsigned int id) +void VimcCameraData::paramsBufferReady([[maybe_unused]] unsigned int id) { }