From patchwork Fri Apr 23 10:47:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 12101 X-Patchwork-Delegate: paul.elder@ideasonboard.com 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 56FB5BDB15 for ; Fri, 23 Apr 2021 10:47:28 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id BE89268883; Fri, 23 Apr 2021 12:47:27 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="MGCK1dFu"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E7D00602D1 for ; Fri, 23 Apr 2021 12:47:26 +0200 (CEST) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 87CF8B1A; Fri, 23 Apr 2021 12:47:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1619174846; bh=Y1yxJ7uN9vavLW0cwUkaBPAb3Ddc3YGdaRFDwKlOwck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MGCK1dFunstnju7qPS7nJcffWcOiYS+rYbMBoM6quIE02Hrzyx5Flss8WNeNP1QeH RFh64Kz3ZL2Bt3M5GNQdibUkFhhvwDXOUCmVGub2jTve62K22hv2WXvyr9muVZzIoa 4hbmWcQcrJMUn9yQd1Kj2WEq1NY7CuxC+MjwV/dU= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Fri, 23 Apr 2021 19:47:11 +0900 Message-Id: <20210423104711.401547-4-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210423104711.401547-1-paul.elder@ideasonboard.com> References: <20210423104711.401547-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 3/3] ipa: mojom: Put core.mojom in the libcamera namespace 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" Put core.mojom in the libcamera namespace, as all structs that are defined in core.mojom are meant to be in that namespace. Fix the structs that are used in the other mojom files accordingly. Signed-off-by: Paul Elder Reviewed-by: Laurent Pinchart --- New in v3 --- include/libcamera/ipa/core.mojom | 2 ++ include/libcamera/ipa/ipu3.mojom | 11 +++++----- include/libcamera/ipa/raspberrypi.mojom | 29 +++++++++++++------------ include/libcamera/ipa/rkisp1.mojom | 13 ++++++----- include/libcamera/ipa/vimc.mojom | 2 +- 5 files changed, 31 insertions(+), 26 deletions(-) diff --git a/include/libcamera/ipa/core.mojom b/include/libcamera/ipa/core.mojom index 70de71ea..6caaa63e 100644 --- a/include/libcamera/ipa/core.mojom +++ b/include/libcamera/ipa/core.mojom @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +module libcamera; + /* * Things that can be defined here (and in other mojom files): * - consts diff --git a/include/libcamera/ipa/ipu3.mojom b/include/libcamera/ipa/ipu3.mojom index 5d13e7ea..a717b1e6 100644 --- a/include/libcamera/ipa/ipu3.mojom +++ b/include/libcamera/ipa/ipu3.mojom @@ -17,22 +17,23 @@ struct IPU3Event { IPU3Operations op; uint32 frame; uint32 bufferId; - ControlList controls; + libcamera.ControlList controls; }; struct IPU3Action { IPU3Operations op; - ControlList controls; + libcamera.ControlList controls; }; interface IPAIPU3Interface { - init(IPASettings settings) => (int32 ret); + init(libcamera.IPASettings settings) => (int32 ret); start() => (int32 ret); stop(); - configure(map entityControls, Size bdsOutputSize) => (); + configure(map entityControls, + libcamera.Size bdsOutputSize) => (); - mapBuffers(array buffers); + mapBuffers(array buffers); unmapBuffers(array ids); [async] processEvent(IPU3Event ev); diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom index f38c2261..42321bee 100644 --- a/include/libcamera/ipa/raspberrypi.mojom +++ b/include/libcamera/ipa/raspberrypi.mojom @@ -26,22 +26,23 @@ struct ISPConfig { uint32 embeddedBufferId; uint32 bayerBufferId; bool embeddedBufferPresent; - ControlList controls; + libcamera.ControlList controls; }; struct IPAConfig { uint32 transform; - FileDescriptor lsTableHandle; + libcamera.FileDescriptor lsTableHandle; }; struct StartConfig { - ControlList controls; + libcamera.ControlList controls; int32 dropFrameCount; }; interface IPARPiInterface { - init(IPASettings settings) => (int32 ret, SensorConfig sensorConfig); - start(ControlList controls) => (StartConfig startConfig); + init(libcamera.IPASettings settings) + => (int32 ret, SensorConfig sensorConfig); + start(libcamera.ControlList controls) => (StartConfig startConfig); stop(); /** @@ -62,11 +63,11 @@ interface IPARPiInterface { * The \a ipaConfig and \a controls parameters carry data passed by the * pipeline handler to the IPA and back. */ - configure(CameraSensorInfo sensorInfo, - map streamConfig, - map entityControls, + configure(libcamera.CameraSensorInfo sensorInfo, + map streamConfig, + map entityControls, IPAConfig ipaConfig) - => (int32 ret, ControlList controls); + => (int32 ret, libcamera.ControlList controls); /** * \fn mapBuffers() @@ -94,7 +95,7 @@ interface IPARPiInterface { * * \sa unmapBuffers() */ - mapBuffers(array buffers); + mapBuffers(array buffers); /** * \fn unmapBuffers() @@ -109,14 +110,14 @@ interface IPARPiInterface { unmapBuffers(array ids); [async] signalStatReady(uint32 bufferId); - [async] signalQueueRequest(ControlList controls); + [async] signalQueueRequest(libcamera.ControlList controls); [async] signalIspPrepare(ISPConfig data); }; interface IPARPiEventInterface { - statsMetadataComplete(uint32 bufferId, ControlList controls); + statsMetadataComplete(uint32 bufferId, libcamera.ControlList controls); runIsp(uint32 bufferId); embeddedComplete(uint32 bufferId); - setIspControls(ControlList controls); - setDelayedControls(ControlList controls); + setIspControls(libcamera.ControlList controls); + setDelayedControls(libcamera.ControlList controls); }; diff --git a/include/libcamera/ipa/rkisp1.mojom b/include/libcamera/ipa/rkisp1.mojom index 29f726e1..cca871a0 100644 --- a/include/libcamera/ipa/rkisp1.mojom +++ b/include/libcamera/ipa/rkisp1.mojom @@ -16,12 +16,12 @@ struct RkISP1Event { RkISP1Operations op; uint32 frame; uint32 bufferId; - ControlList controls; + libcamera.ControlList controls; }; struct RkISP1Action { RkISP1Operations op; - ControlList controls; + libcamera.ControlList controls; }; interface IPARkISP1Interface { @@ -29,11 +29,12 @@ interface IPARkISP1Interface { start() => (int32 ret); stop(); - configure(CameraSensorInfo sensorInfo, - map streamConfig, - map entityControls) => (int32 ret); + configure(libcamera.CameraSensorInfo sensorInfo, + map streamConfig, + map entityControls) + => (int32 ret); - mapBuffers(array buffers); + mapBuffers(array buffers); unmapBuffers(array ids); [async] processEvent(RkISP1Event ev); diff --git a/include/libcamera/ipa/vimc.mojom b/include/libcamera/ipa/vimc.mojom index 165d9401..be4b85b8 100644 --- a/include/libcamera/ipa/vimc.mojom +++ b/include/libcamera/ipa/vimc.mojom @@ -14,7 +14,7 @@ enum IPAOperationCode { }; interface IPAVimcInterface { - init(IPASettings settings) => (int32 ret); + init(libcamera.IPASettings settings) => (int32 ret); start() => (int32 ret); stop(); };