[{"id":16537,"web_url":"https://patchwork.libcamera.org/comment/16537/","msgid":"<YIX8+ahcQ5OjYo0z@pendragon.ideasonboard.com>","date":"2021-04-25T23:36:25","subject":"Re: [libcamera-devel] [PATCH v3 3/3] ipa: mojom: Put core.mojom in\n\tthe libcamera namespace","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Paul,\n\nThank you for the patch.\n\nOn Fri, Apr 23, 2021 at 07:47:11PM +0900, Paul Elder wrote:\n> Put core.mojom in the libcamera namespace, as all structs that are\n> defined in core.mojom are meant to be in that namespace. Fix the structs\n> that are used in the other mojom files accordingly.\n> \n> Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>\n\nIt's much more explicit this way, nice !\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nI wonder if core.mojom should be renamed to libcamera.mojom on top of\nthis.\n\n> ---\n> New in v3\n> ---\n>  include/libcamera/ipa/core.mojom        |  2 ++\n>  include/libcamera/ipa/ipu3.mojom        | 11 +++++-----\n>  include/libcamera/ipa/raspberrypi.mojom | 29 +++++++++++++------------\n>  include/libcamera/ipa/rkisp1.mojom      | 13 ++++++-----\n>  include/libcamera/ipa/vimc.mojom        |  2 +-\n>  5 files changed, 31 insertions(+), 26 deletions(-)\n> \n> diff --git a/include/libcamera/ipa/core.mojom b/include/libcamera/ipa/core.mojom\n> index 70de71ea..6caaa63e 100644\n> --- a/include/libcamera/ipa/core.mojom\n> +++ b/include/libcamera/ipa/core.mojom\n> @@ -1,5 +1,7 @@\n>  /* SPDX-License-Identifier: LGPL-2.1-or-later */\n>  \n> +module libcamera;\n> +\n>  /*\n>   * Things that can be defined here (and in other mojom files):\n>   * - consts\n> diff --git a/include/libcamera/ipa/ipu3.mojom b/include/libcamera/ipa/ipu3.mojom\n> index 5d13e7ea..a717b1e6 100644\n> --- a/include/libcamera/ipa/ipu3.mojom\n> +++ b/include/libcamera/ipa/ipu3.mojom\n> @@ -17,22 +17,23 @@ struct IPU3Event {\n>  \tIPU3Operations op;\n>  \tuint32 frame;\n>  \tuint32 bufferId;\n> -\tControlList controls;\n> +\tlibcamera.ControlList controls;\n>  };\n>  \n>  struct IPU3Action {\n>  \tIPU3Operations op;\n> -\tControlList controls;\n> +\tlibcamera.ControlList controls;\n>  };\n>  \n>  interface IPAIPU3Interface {\n> -\tinit(IPASettings settings) => (int32 ret);\n> +\tinit(libcamera.IPASettings settings) => (int32 ret);\n>  \tstart() => (int32 ret);\n>  \tstop();\n>  \n> -\tconfigure(map<uint32, ControlInfoMap> entityControls, Size bdsOutputSize) => ();\n> +\tconfigure(map<uint32, libcamera.ControlInfoMap> entityControls,\n> +\t\t  libcamera.Size bdsOutputSize) => ();\n>  \n> -\tmapBuffers(array<IPABuffer> buffers);\n> +\tmapBuffers(array<libcamera.IPABuffer> buffers);\n>  \tunmapBuffers(array<uint32> ids);\n>  \n>  \t[async] processEvent(IPU3Event ev);\n> diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom\n> index f38c2261..42321bee 100644\n> --- a/include/libcamera/ipa/raspberrypi.mojom\n> +++ b/include/libcamera/ipa/raspberrypi.mojom\n> @@ -26,22 +26,23 @@ struct ISPConfig {\n>  \tuint32 embeddedBufferId;\n>  \tuint32 bayerBufferId;\n>  \tbool embeddedBufferPresent;\n> -\tControlList controls;\n> +\tlibcamera.ControlList controls;\n>  };\n>  \n>  struct IPAConfig {\n>  \tuint32 transform;\n> -\tFileDescriptor lsTableHandle;\n> +\tlibcamera.FileDescriptor lsTableHandle;\n>  };\n>  \n>  struct StartConfig {\n> -\tControlList controls;\n> +\tlibcamera.ControlList controls;\n>  \tint32 dropFrameCount;\n>  };\n>  \n>  interface IPARPiInterface {\n> -\tinit(IPASettings settings) => (int32 ret, SensorConfig sensorConfig);\n> -\tstart(ControlList controls) => (StartConfig startConfig);\n> +\tinit(libcamera.IPASettings settings)\n> +\t\t=> (int32 ret, SensorConfig sensorConfig);\n> +\tstart(libcamera.ControlList controls) => (StartConfig startConfig);\n>  \tstop();\n>  \n>  \t/**\n> @@ -62,11 +63,11 @@ interface IPARPiInterface {\n>  \t * The \\a ipaConfig and \\a controls parameters carry data passed by the\n>  \t * pipeline handler to the IPA and back.\n>  \t */\n> -\tconfigure(CameraSensorInfo sensorInfo,\n> -\t\t  map<uint32, IPAStream> streamConfig,\n> -\t\t  map<uint32, ControlInfoMap> entityControls,\n> +\tconfigure(libcamera.CameraSensorInfo sensorInfo,\n> +\t\t  map<uint32, libcamera.IPAStream> streamConfig,\n> +\t\t  map<uint32, libcamera.ControlInfoMap> entityControls,\n>  \t\t  IPAConfig ipaConfig)\n> -\t\t=> (int32 ret, ControlList controls);\n> +\t\t=> (int32 ret, libcamera.ControlList controls);\n>  \n>  \t/**\n>  \t * \\fn mapBuffers()\n> @@ -94,7 +95,7 @@ interface IPARPiInterface {\n>  \t *\n>  \t * \\sa unmapBuffers()\n>  \t */\n> -\tmapBuffers(array<IPABuffer> buffers);\n> +\tmapBuffers(array<libcamera.IPABuffer> buffers);\n>  \n>  \t/**\n>  \t * \\fn unmapBuffers()\n> @@ -109,14 +110,14 @@ interface IPARPiInterface {\n>  \tunmapBuffers(array<uint32> ids);\n>  \n>  \t[async] signalStatReady(uint32 bufferId);\n> -\t[async] signalQueueRequest(ControlList controls);\n> +\t[async] signalQueueRequest(libcamera.ControlList controls);\n>  \t[async] signalIspPrepare(ISPConfig data);\n>  };\n>  \n>  interface IPARPiEventInterface {\n> -\tstatsMetadataComplete(uint32 bufferId, ControlList controls);\n> +\tstatsMetadataComplete(uint32 bufferId, libcamera.ControlList controls);\n>  \trunIsp(uint32 bufferId);\n>  \tembeddedComplete(uint32 bufferId);\n> -\tsetIspControls(ControlList controls);\n> -\tsetDelayedControls(ControlList controls);\n> +\tsetIspControls(libcamera.ControlList controls);\n> +\tsetDelayedControls(libcamera.ControlList controls);\n>  };\n> diff --git a/include/libcamera/ipa/rkisp1.mojom b/include/libcamera/ipa/rkisp1.mojom\n> index 29f726e1..cca871a0 100644\n> --- a/include/libcamera/ipa/rkisp1.mojom\n> +++ b/include/libcamera/ipa/rkisp1.mojom\n> @@ -16,12 +16,12 @@ struct RkISP1Event {\n>  \tRkISP1Operations op;\n>  \tuint32 frame;\n>  \tuint32 bufferId;\n> -\tControlList controls;\n> +\tlibcamera.ControlList controls;\n>  };\n>  \n>  struct RkISP1Action {\n>  \tRkISP1Operations op;\n> -\tControlList controls;\n> +\tlibcamera.ControlList controls;\n>  };\n>  \n>  interface IPARkISP1Interface {\n> @@ -29,11 +29,12 @@ interface IPARkISP1Interface {\n>  \tstart() => (int32 ret);\n>  \tstop();\n>  \n> -\tconfigure(CameraSensorInfo sensorInfo,\n> -\t\t  map<uint32, IPAStream> streamConfig,\n> -\t\t  map<uint32, ControlInfoMap> entityControls) => (int32 ret);\n> +\tconfigure(libcamera.CameraSensorInfo sensorInfo,\n> +\t\t  map<uint32, libcamera.IPAStream> streamConfig,\n> +\t\t  map<uint32, libcamera.ControlInfoMap> entityControls)\n> +\t\t=> (int32 ret);\n>  \n> -\tmapBuffers(array<IPABuffer> buffers);\n> +\tmapBuffers(array<libcamera.IPABuffer> buffers);\n>  \tunmapBuffers(array<uint32> ids);\n>  \n>  \t[async] processEvent(RkISP1Event ev);\n> diff --git a/include/libcamera/ipa/vimc.mojom b/include/libcamera/ipa/vimc.mojom\n> index 165d9401..be4b85b8 100644\n> --- a/include/libcamera/ipa/vimc.mojom\n> +++ b/include/libcamera/ipa/vimc.mojom\n> @@ -14,7 +14,7 @@ enum IPAOperationCode {\n>  };\n>  \n>  interface IPAVimcInterface {\n> -\tinit(IPASettings settings) => (int32 ret);\n> +\tinit(libcamera.IPASettings settings) => (int32 ret);\n>  \tstart() => (int32 ret);\n>  \tstop();\n>  };","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 6ADC4BDC91\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSun, 25 Apr 2021 23:36:31 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1CCC46887C;\n\tMon, 26 Apr 2021 01:36:31 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9467A602D1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 26 Apr 2021 01:36:30 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 28F184FB;\n\tMon, 26 Apr 2021 01:36:30 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"Lh3mM8Va\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1619393790;\n\tbh=xnSsI3jXytEDxTziC2UCD8JA1sFOjKz8784iz29ttUg=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Lh3mM8VaOEGqsTRweIgOvdK25TAIyy/7p7kd179tHl8/dHAiTT+ICN5GdphM8IS+o\n\tesylTlBRnHVkjYlzXqUMgb10OfQYFyIALn1joNJJ4/HdE3iRLhJmKHNL4rfpQSa2m9\n\t7xU6cJpuvKtI3vwdiBgEeguxsdAEbYsrqOEDXX/Q=","Date":"Mon, 26 Apr 2021 02:36:25 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Paul Elder <paul.elder@ideasonboard.com>","Message-ID":"<YIX8+ahcQ5OjYo0z@pendragon.ideasonboard.com>","References":"<20210423104711.401547-1-paul.elder@ideasonboard.com>\n\t<20210423104711.401547-4-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210423104711.401547-4-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v3 3/3] ipa: mojom: Put core.mojom in\n\tthe libcamera namespace","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]