[{"id":17033,"web_url":"https://patchwork.libcamera.org/comment/17033/","msgid":"<20210520025144.GD902042@pyrite.rasen.tech>","date":"2021-05-20T02:51:44","subject":"Re: [libcamera-devel] [PATCH v2 3/7] ipa: ipc: Rename\n\tCameraSensorInfo to IPACameraSensorInfo","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"On Wed, May 19, 2021 at 03:49:50PM +0530, Umang Jain wrote:\n> This matches the naming convention for IPA IPC.\n> \n> Signed-off-by: Umang Jain \n\nAcked-by: Paul Elder \n\n> ---\n> Documentation/guides/ipa.rst | 8 ++--\n> include/libcamera/internal/camera_sensor.h | 2 +-\n> include/libcamera/ipa/core.mojom | 2 +-\n> include/libcamera/ipa/raspberrypi.mojom | 2 +-\n> include/libcamera/ipa/rkisp1.mojom | 2 +-\n> src/ipa/ipu3/ipu3_agc.cpp | 2 +-\n> src/ipa/raspberrypi/raspberrypi.cpp | 8 ++--\n> src/ipa/rkisp1/rkisp1.cpp | 6 +--\n> src/libcamera/camera_sensor.cpp | 6 +--\n> src/libcamera/ipa/core_ipa_interface.cpp | 38 +++++++++----------\n> src/libcamera/pipeline/ipu3/ipu3.cpp | 4 +-\n> .../pipeline/raspberrypi/raspberrypi.cpp | 4 +-\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n> 13 files changed, 43 insertions(+), 43 deletions(-)\n> \n> diff --git a/Documentation/guides/ipa.rst b/Documentation/guides/ipa.rst\n> index cbffbd9a..6d460e13 100644\n> --- a/Documentation/guides/ipa.rst\n> +++ b/Documentation/guides/ipa.rst\n> @@ -74,7 +74,7 @@ serialization, any custom data containers must be defined with the mojo IDL.\n> The following list of libcamera objects are supported in the interface\n> definition, and may be used as function parameter types or struct field types:\n> \n> -- libcamera.CameraSensorInfo\n> +- libcamera.IPACameraSensorInfo\n> - libcamera.ControlInfoMap\n> - libcamera.ControlList\n> - libcamera.FileDescriptor\n> @@ -208,7 +208,7 @@ The following is an example of a main interface definition:\n> start() => (int32 ret);\n> stop();\n> \n> - configure(libcamera.CameraSensorInfo sensorInfo,\n> + configure(libcamera.IPACameraSensorInfo sensorInfo,\n> map streamConfig,\n> map entityControls,\n> ConfigInput ipaConfig)\n> @@ -470,7 +470,7 @@ definition:\n> \n> .. code-block:: none\n> \n> - configure(libcamera.CameraSensorInfo sensorInfo,\n> + configure(libcamera.IPACameraSensorInfo sensorInfo,\n> uint32 exampleNumber,\n> map streamConfig,\n> map entityControls,\n> @@ -481,7 +481,7 @@ We will need to implement a function with the following function signature:\n> \n> .. code-block:: C++\n> \n> - int configure(const CameraSensorInfo &sensorInfo,\n> + int configure(const IPACameraSensorInfo &sensorInfo,\n> uint32_t exampleNumber,\n> const std::map &streamConfig,\n> const std::map &entityControls,\n> diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\n> index 0905ebfa..cf6c1c1e 100644\n> --- a/include/libcamera/internal/camera_sensor.h\n> +++ b/include/libcamera/internal/camera_sensor.h\n> @@ -51,7 +51,7 @@ public:\n> \tV4L2Subdevice *device() { return subdev_.get(); }\n> \n> \tconst ControlList &properties() const { return properties_; }\n> -\tint sensorInfo(CameraSensorInfo *info) const;\n> +\tint sensorInfo(IPACameraSensorInfo *info) const;\n> \n> \tvoid updateControlInfo();\n> \n> diff --git a/include/libcamera/ipa/core.mojom b/include/libcamera/ipa/core.mojom\n> index b95b3dc4..34a799c2 100644\n> --- a/include/libcamera/ipa/core.mojom\n> +++ b/include/libcamera/ipa/core.mojom\n> @@ -78,7 +78,7 @@ module libcamera;\n> \tuint32 height;\n> };\n> \n> -struct CameraSensorInfo {\n> +struct IPACameraSensorInfo {\n> \tstring model;\n> \n> \tuint32 bitsPerPixel;\n> diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom\n> index 42321bee..0a21f453 100644\n> --- a/include/libcamera/ipa/raspberrypi.mojom\n> +++ b/include/libcamera/ipa/raspberrypi.mojom\n> @@ -63,7 +63,7 @@ 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(libcamera.CameraSensorInfo sensorInfo,\n> +\tconfigure(libcamera.IPACameraSensorInfo sensorInfo,\n> \t\t map streamConfig,\n> \t\t map entityControls,\n> \t\t IPAConfig ipaConfig)\n> diff --git a/include/libcamera/ipa/rkisp1.mojom b/include/libcamera/ipa/rkisp1.mojom\n> index cca871a0..66a4607c 100644\n> --- a/include/libcamera/ipa/rkisp1.mojom\n> +++ b/include/libcamera/ipa/rkisp1.mojom\n> @@ -29,7 +29,7 @@ interface IPARkISP1Interface {\n> \tstart() => (int32 ret);\n> \tstop();\n> \n> -\tconfigure(libcamera.CameraSensorInfo sensorInfo,\n> +\tconfigure(libcamera.IPACameraSensorInfo sensorInfo,\n> \t\t map streamConfig,\n> \t\t map entityControls)\n> \t\t=> (int32 ret);\n> diff --git a/src/ipa/ipu3/ipu3_agc.cpp b/src/ipa/ipu3/ipu3_agc.cpp\n> index ca54d89a..8bae423f 100644\n> --- a/src/ipa/ipu3/ipu3_agc.cpp\n> +++ b/src/ipa/ipu3/ipu3_agc.cpp\n> @@ -39,7 +39,7 @@ static constexpr uint32_t kMaxGain = kMaxISO / 100;\n> static constexpr uint32_t kMinExposure = 1;\n> static constexpr uint32_t kMaxExposure = 1976;\n> \n> -/* \\todo those should be get from CameraSensorInfo ! */\n> +/* \\todo those should be got from IPACameraSensorInfo ! */\n> /* line duration in microseconds */\n> static constexpr double kLineDuration = 16.8;\n> static constexpr double kMaxExposureTime = kMaxExposure * kLineDuration;\n> diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\n> index 87774500..e5bb8159 100644\n> --- a/src/ipa/raspberrypi/raspberrypi.cpp\n> +++ b/src/ipa/raspberrypi/raspberrypi.cpp\n> @@ -89,7 +89,7 @@ public:\n> \tvoid start(const ControlList &controls, ipa::RPi::StartConfig *startConfig) override;\n> \tvoid stop() override {}\n> \n> -\tint configure(const CameraSensorInfo &sensorInfo,\n> +\tint configure(const IPACameraSensorInfo &sensorInfo,\n> \t\t const std::map &streamConfig,\n> \t\t const std::map &entityControls,\n> \t\t const ipa::RPi::IPAConfig &data,\n> @@ -101,7 +101,7 @@ public:\n> \tvoid signalIspPrepare(const ipa::RPi::ISPConfig &data) override;\n> \n> private:\n> -\tvoid setMode(const CameraSensorInfo &sensorInfo);\n> +\tvoid setMode(const IPACameraSensorInfo &sensorInfo);\n> \tbool validateSensorControls();\n> \tbool validateIspControls();\n> \tvoid queueRequest(const ControlList &controls);\n> @@ -278,7 +278,7 @@ void IPARPi::start(const ControlList &controls, ipa::RPi::StartConfig *startConf\n> \tlastRunTimestamp_ = 0;\n> }\n> \n> -void IPARPi::setMode(const CameraSensorInfo &sensorInfo)\n> +void IPARPi::setMode(const IPACameraSensorInfo &sensorInfo)\n> {\n> \tmode_.bitdepth = sensorInfo.bitsPerPixel;\n> \tmode_.width = sensorInfo.outputSize.width;\n> @@ -323,7 +323,7 @@ void IPARPi::setMode(const CameraSensorInfo &sensorInfo)\n> \tmode_.max_frame_length = sensorInfo.maxFrameLength;\n> }\n> \n> -int IPARPi::configure(const CameraSensorInfo &sensorInfo,\n> +int IPARPi::configure(const IPACameraSensorInfo &sensorInfo,\n> \t\t [[maybe_unused]] const std::map &streamConfig,\n> \t\t const std::map &entityControls,\n> \t\t const ipa::RPi::IPAConfig &ipaConfig,\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index 6d45673c..b47ea324 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -37,7 +37,7 @@ public:\n> \tint start() override;\n> \tvoid stop() override {}\n> \n> -\tint configure(const CameraSensorInfo &info,\n> +\tint configure(const IPACameraSensorInfo &info,\n> \t\t const std::map &streamConfig,\n> \t\t const std::map &entityControls) override;\n> \tvoid mapBuffers(const std::vector &buffers) override;\n> @@ -90,12 +90,12 @@ int IPARkISP1::start()\n> }\n> \n> /**\n> - * \\todo The RkISP1 pipeline currently provides an empty CameraSensorInfo\n> + * \\todo The RkISP1 pipeline currently provides an empty IPACameraSensorInfo\n> * if the connected sensor does not provide enough information to properly\n> * assemble one. Make sure the reported sensor information are relevant\n> * before accessing them.\n> */\n> -int IPARkISP1::configure([[maybe_unused]] const CameraSensorInfo &info,\n> +int IPARkISP1::configure([[maybe_unused]] const IPACameraSensorInfo &info,\n> \t\t\t [[maybe_unused]] const std::map &streamConfig,\n> \t\t\t const std::map &entityControls)\n> {\n> diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\n> index 170de827..0fb8a258 100644\n> --- a/src/libcamera/camera_sensor.cpp\n> +++ b/src/libcamera/camera_sensor.cpp\n> @@ -205,7 +205,7 @@ int CameraSensor::validateSensorDriver()\n> \t *\n> \t * Failures in reading any of the targets are not deemed to be fatal,\n> \t * but some properties and features, like constructing a\n> -\t * CameraSensorInfo for the IPA module, won't be supported.\n> +\t * IPACameraSensorInfo for the IPA module, won't be supported.\n> \t *\n> \t * \\todo Make support for selection targets mandatory as soon as all\n> \t * test platforms have been updated.\n> @@ -674,7 +674,7 @@ int CameraSensor::setControls(ControlList *ctrls)\n> *\n> * \\return 0 on success, a negative error code otherwise\n> */\n> -int CameraSensor::sensorInfo(CameraSensorInfo *info) const\n> +int CameraSensor::sensorInfo(IPACameraSensorInfo *info) const\n> {\n> \tif (!bayerFormat_)\n> \t\treturn -EINVAL;\n> @@ -701,7 +701,7 @@ int CameraSensor::sensorInfo(CameraSensorInfo *info) const\n> \t}\n> \n> \t/*\n> -\t * CameraSensorInfo::analogCrop::x and CameraSensorInfo::analogCrop::y\n> +\t * IPACameraSensorInfo::analogCrop::x and IPACameraSensorInfo::analogCrop::y\n> \t * are defined relatively to the active pixel area, while V4L2's\n> \t * TGT_CROP target is defined in respect to the full pixel array.\n> \t *\n> diff --git a/src/libcamera/ipa/core_ipa_interface.cpp b/src/libcamera/ipa/core_ipa_interface.cpp\n> index def8d184..15d61d91 100644\n> --- a/src/libcamera/ipa/core_ipa_interface.cpp\n> +++ b/src/libcamera/ipa/core_ipa_interface.cpp\n> @@ -103,7 +103,7 @@ namespace libcamera {\n> */\n> \n> /**\n> - * \\struct CameraSensorInfo\n> + * \\struct IPACameraSensorInfo\n> * \\brief Report the image sensor characteristics\n> *\n> * The structure reports image sensor characteristics used by IPA modules to\n> @@ -121,15 +121,15 @@ namespace libcamera {\n> */\n> \n> /**\n> - * \\fn CameraSensorInfo::CameraSensorInfo(const std::string &model,\n> -\t\t\t\t\t uint32_t bitsPerPixel,\n> -\t\t\t\t\t const Size &activeAreaSize,\n> -\t\t\t\t\t const Rectangle &analogCrop,\n> -\t\t\t\t\t const Size &outputSize,\n> -\t\t\t\t\t uint64_t pixelRate,\n> -\t\t\t\t\t uint32_t lineLength,\n> -\t\t\t\t\t uint32_t minFrameLength,\n> -\t\t\t\t\t uint32_t maxFrameLength)\n> + * \\fn IPACameraSensorInfo::IPACameraSensorInfo(const std::string &model,\n> +\t\t\t\t\t\tuint32_t bitsPerPixel,\n> +\t\t\t\t\t\tconst Size &activeAreaSize,\n> +\t\t\t\t\t\tconst Rectangle &analogCrop,\n> +\t\t\t\t\t\tconst Size &outputSize,\n> +\t\t\t\t\t\tuint64_t pixelRate,\n> +\t\t\t\t\t\tuint32_t lineLength,\n> +\t\t\t\t\t\tuint32_t minFrameLength,\n> +\t\t\t\t\t\tuint32_t maxFrameLength)\n> * \\param[in] model\n> * \\param[in] bitsPerPixel\n> * \\param[in] activeAreaSize\n> @@ -142,7 +142,7 @@ namespace libcamera {\n> */\n> \n> /**\n> - * \\var CameraSensorInfo::model\n> + * \\var IPACameraSensorInfo::model\n> * \\brief The image sensor model name\n> *\n> * The sensor model name is a free-formed string that uniquely identifies the\n> @@ -150,18 +150,18 @@ namespace libcamera {\n> */\n> \n> /**\n> - * \\var CameraSensorInfo::bitsPerPixel\n> + * \\var IPACameraSensorInfo::bitsPerPixel\n> * \\brief The number of bits per pixel of the image format produced by the\n> * image sensor\n> */\n> \n> /**\n> - * \\var CameraSensorInfo::activeAreaSize\n> + * \\var IPACameraSensorInfo::activeAreaSize\n> * \\brief The size of the pixel array active area of the sensor\n> */\n> \n> /**\n> - * \\var CameraSensorInfo::analogCrop\n> + * \\var IPACameraSensorInfo::analogCrop\n> * \\brief The portion of the pixel array active area which is read-out and\n> * processed\n> *\n> @@ -174,7 +174,7 @@ namespace libcamera {\n> */\n> \n> /**\n> - * \\var CameraSensorInfo::outputSize\n> + * \\var IPACameraSensorInfo::outputSize\n> * \\brief The size of the images produced by the camera sensor\n> *\n> * The output image size defines the horizontal and vertical sizes of the images\n> @@ -187,7 +187,7 @@ namespace libcamera {\n> */\n> \n> /**\n> - * \\var CameraSensorInfo::pixelRate\n> + * \\var IPACameraSensorInfo::pixelRate\n> * \\brief The number of pixels produced in a second\n> *\n> * To obtain the read-out time in seconds of a full line:\n> @@ -198,14 +198,14 @@ namespace libcamera {\n> */\n> \n> /**\n> - * \\var CameraSensorInfo::lineLength\n> + * \\var IPACameraSensorInfo::lineLength\n> * \\brief Total line length in pixels\n> *\n> * The total line length in pixel clock periods, including blanking.\n> */\n> \n> /**\n> - * \\var CameraSensorInfo::minFrameLength\n> + * \\var IPACameraSensorInfo::minFrameLength\n> * \\brief The minimum allowable frame length in units of lines\n> *\n> * The sensor frame length comprises of active output lines and blanking lines\n> @@ -220,7 +220,7 @@ namespace libcamera {\n> */\n> \n> /**\n> - * \\var CameraSensorInfo::maxFrameLength\n> + * \\var IPACameraSensorInfo::maxFrameLength\n> * \\brief The maximum allowable frame length in units of lines\n> *\n> * The sensor frame length comprises of active output lines and blanking lines\n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index ade8ffbd..98c6160f 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -544,7 +544,7 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n> \tif (ret)\n> \t\treturn ret;\n> \n> -\tCameraSensorInfo sensorInfo;\n> +\tIPACameraSensorInfo sensorInfo;\n> \tcio2->sensor()->sensorInfo(&sensorInfo);\n> \tdata->cropRegion_ = sensorInfo.analogCrop;\n> \n> @@ -883,7 +883,7 @@ int PipelineHandlerIPU3::initControls(IPU3CameraData *data)\n> \tif (ret)\n> \t\treturn ret;\n> \n> -\tCameraSensorInfo sensorInfo{};\n> +\tIPACameraSensorInfo sensorInfo{};\n> \tret = sensor->sensorInfo(&sensorInfo);\n> \tif (ret)\n> \t\treturn ret;\n> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> index 6fbdba04..f2a94dc0 100644\n> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> @@ -211,7 +211,7 @@ public:\n> \tBayerFormat::Order nativeBayerOrder_;\n> \n> \t/* For handling digital zoom. */\n> -\tCameraSensorInfo sensorInfo_;\n> +\tIPACameraSensorInfo sensorInfo_;\n> \tRectangle ispCrop_; /* crop in ISP (camera mode) pixels */\n> \tRectangle scalerCrop_; /* crop in sensor native pixels */\n> \tbool updateScalerCrop_;\n> @@ -1275,7 +1275,7 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)\n> \t\tipaConfig.lsTableHandle = lsTable_;\n> \t}\n> \n> -\t/* We store the CameraSensorInfo for digital zoom calculations. */\n> +\t/* We store the IPACameraSensorInfo for digital zoom calculations. */\n> \tint ret = sensor_->sensorInfo(&sensorInfo_);\n> \tif (ret) {\n> \t\tLOG(RPI, Error) << \"Failed to retrieve camera sensor info\";\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index adebe8b5..6699839c 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -648,7 +648,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n> \t\treturn ret;\n> \n> \t/* Inform IPA of stream configuration and sensor controls. */\n> -\tCameraSensorInfo sensorInfo = {};\n> +\tIPACameraSensorInfo sensorInfo = {};\n> \tret = data->sensor_->sensorInfo(&sensorInfo);\n> \tif (ret) {\n> \t\t/* \\todo Turn this into a hard failure. */\n> -- \n> 2.26.2\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 C058FC31FF\n\tfor ;\n\tThu, 20 May 2021 02:51:54 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3246168918;\n\tThu, 20 May 2021 04:51:54 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 412906050F\n\tfor ;\n\tThu, 20 May 2021 04:51:52 +0200 (CEST)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C07E88DF;\n\tThu, 20 May 2021 04:51:50 +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=\"jYDnNfK8\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1621479111;\n\tbh=ruT3/Go5rOxRhcMdRa6wn3qA6g/Dyyty737BYAwztJU=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=jYDnNfK8FfF8uYW6fIbGROoSGYLVjlBInMnnqwj99u/Uo13gAJ4FrjA1i7iQnadp/\n\tinEHxTxfIQPOPsExaS67N0daQ8LeegqYNfcRsZzOnv5F1Z20RqR/HXqqtxqf3rPPAN\n\tvu69ELnmvObuAZaR+XDHO/2lsLLM5gSkPsz96p4c=","Date":"Thu, 20 May 2021 11:51:44 +0900","From":"paul.elder@ideasonboard.com","To":"Umang Jain ","Message-ID":"<20210520025144.GD902042@pyrite.rasen.tech>","References":"<20210519101954.77711-1-umang.jain@ideasonboard.com>\n\t<20210519101954.77711-4-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<20210519101954.77711-4-umang.jain@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 3/7] ipa: ipc: Rename\n\tCameraSensorInfo to IPACameraSensorInfo","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","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":17059,"web_url":"https://patchwork.libcamera.org/comment/17059/","msgid":"","date":"2021-05-21T09:01:18","subject":"Re: [libcamera-devel] [PATCH v2 3/7] ipa: ipc: Rename\n\tCameraSensorInfo to IPACameraSensorInfo","submitter":{"id":75,"url":"https://patchwork.libcamera.org/api/people/75/","name":"Jean-Michel Hautbois","email":"jeanmichel.hautbois@ideasonboard.com"},"content":"Hi Umang\n\nOn 20/05/2021 04:51, paul.elder@ideasonboard.com wrote:\n> On Wed, May 19, 2021 at 03:49:50PM +0530, Umang Jain wrote:\n>> This matches the naming convention for IPA IPC.\n>>\n>> Signed-off-by: Umang Jain \n> \n> Acked-by: Paul Elder \nReviewed-by: Jean-Michel Hautbois \n> \n>> ---\n>> Documentation/guides/ipa.rst | 8 ++--\n>> include/libcamera/internal/camera_sensor.h | 2 +-\n>> include/libcamera/ipa/core.mojom | 2 +-\n>> include/libcamera/ipa/raspberrypi.mojom | 2 +-\n>> include/libcamera/ipa/rkisp1.mojom | 2 +-\n>> src/ipa/ipu3/ipu3_agc.cpp | 2 +-\n>> src/ipa/raspberrypi/raspberrypi.cpp | 8 ++--\n>> src/ipa/rkisp1/rkisp1.cpp | 6 +--\n>> src/libcamera/camera_sensor.cpp | 6 +--\n>> src/libcamera/ipa/core_ipa_interface.cpp | 38 +++++++++----------\n>> src/libcamera/pipeline/ipu3/ipu3.cpp | 4 +-\n>> .../pipeline/raspberrypi/raspberrypi.cpp | 4 +-\n>> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n>> 13 files changed, 43 insertions(+), 43 deletions(-)\n>>\n>> diff --git a/Documentation/guides/ipa.rst b/Documentation/guides/ipa.rst\n>> index cbffbd9a..6d460e13 100644\n>> --- a/Documentation/guides/ipa.rst\n>> +++ b/Documentation/guides/ipa.rst\n>> @@ -74,7 +74,7 @@ serialization, any custom data containers must be defined with the mojo IDL.\n>> The following list of libcamera objects are supported in the interface\n>> definition, and may be used as function parameter types or struct field types:\n>> \n>> -- libcamera.CameraSensorInfo\n>> +- libcamera.IPACameraSensorInfo\n>> - libcamera.ControlInfoMap\n>> - libcamera.ControlList\n>> - libcamera.FileDescriptor\n>> @@ -208,7 +208,7 @@ The following is an example of a main interface definition:\n>> start() => (int32 ret);\n>> stop();\n>> \n>> - configure(libcamera.CameraSensorInfo sensorInfo,\n>> + configure(libcamera.IPACameraSensorInfo sensorInfo,\n>> map streamConfig,\n>> map entityControls,\n>> ConfigInput ipaConfig)\n>> @@ -470,7 +470,7 @@ definition:\n>> \n>> .. code-block:: none\n>> \n>> - configure(libcamera.CameraSensorInfo sensorInfo,\n>> + configure(libcamera.IPACameraSensorInfo sensorInfo,\n>> uint32 exampleNumber,\n>> map streamConfig,\n>> map entityControls,\n>> @@ -481,7 +481,7 @@ We will need to implement a function with the following function signature:\n>> \n>> .. code-block:: C++\n>> \n>> - int configure(const CameraSensorInfo &sensorInfo,\n>> + int configure(const IPACameraSensorInfo &sensorInfo,\n>> uint32_t exampleNumber,\n>> const std::map &streamConfig,\n>> const std::map &entityControls,\n>> diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\n>> index 0905ebfa..cf6c1c1e 100644\n>> --- a/include/libcamera/internal/camera_sensor.h\n>> +++ b/include/libcamera/internal/camera_sensor.h\n>> @@ -51,7 +51,7 @@ public:\n>> \tV4L2Subdevice *device() { return subdev_.get(); }\n>> \n>> \tconst ControlList &properties() const { return properties_; }\n>> -\tint sensorInfo(CameraSensorInfo *info) const;\n>> +\tint sensorInfo(IPACameraSensorInfo *info) const;\n>> \n>> \tvoid updateControlInfo();\n>> \n>> diff --git a/include/libcamera/ipa/core.mojom b/include/libcamera/ipa/core.mojom\n>> index b95b3dc4..34a799c2 100644\n>> --- a/include/libcamera/ipa/core.mojom\n>> +++ b/include/libcamera/ipa/core.mojom\n>> @@ -78,7 +78,7 @@ module libcamera;\n>> \tuint32 height;\n>> };\n>> \n>> -struct CameraSensorInfo {\n>> +struct IPACameraSensorInfo {\n>> \tstring model;\n>> \n>> \tuint32 bitsPerPixel;\n>> diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom\n>> index 42321bee..0a21f453 100644\n>> --- a/include/libcamera/ipa/raspberrypi.mojom\n>> +++ b/include/libcamera/ipa/raspberrypi.mojom\n>> @@ -63,7 +63,7 @@ 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(libcamera.CameraSensorInfo sensorInfo,\n>> +\tconfigure(libcamera.IPACameraSensorInfo sensorInfo,\n>> \t\t map streamConfig,\n>> \t\t map entityControls,\n>> \t\t IPAConfig ipaConfig)\n>> diff --git a/include/libcamera/ipa/rkisp1.mojom b/include/libcamera/ipa/rkisp1.mojom\n>> index cca871a0..66a4607c 100644\n>> --- a/include/libcamera/ipa/rkisp1.mojom\n>> +++ b/include/libcamera/ipa/rkisp1.mojom\n>> @@ -29,7 +29,7 @@ interface IPARkISP1Interface {\n>> \tstart() => (int32 ret);\n>> \tstop();\n>> \n>> -\tconfigure(libcamera.CameraSensorInfo sensorInfo,\n>> +\tconfigure(libcamera.IPACameraSensorInfo sensorInfo,\n>> \t\t map streamConfig,\n>> \t\t map entityControls)\n>> \t\t=> (int32 ret);\n>> diff --git a/src/ipa/ipu3/ipu3_agc.cpp b/src/ipa/ipu3/ipu3_agc.cpp\n>> index ca54d89a..8bae423f 100644\n>> --- a/src/ipa/ipu3/ipu3_agc.cpp\n>> +++ b/src/ipa/ipu3/ipu3_agc.cpp\n>> @@ -39,7 +39,7 @@ static constexpr uint32_t kMaxGain = kMaxISO / 100;\n>> static constexpr uint32_t kMinExposure = 1;\n>> static constexpr uint32_t kMaxExposure = 1976;\n>> \n>> -/* \\todo those should be get from CameraSensorInfo ! */\n>> +/* \\todo those should be got from IPACameraSensorInfo ! */\n>> /* line duration in microseconds */\n>> static constexpr double kLineDuration = 16.8;\n>> static constexpr double kMaxExposureTime = kMaxExposure * kLineDuration;\n>> diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\n>> index 87774500..e5bb8159 100644\n>> --- a/src/ipa/raspberrypi/raspberrypi.cpp\n>> +++ b/src/ipa/raspberrypi/raspberrypi.cpp\n>> @@ -89,7 +89,7 @@ public:\n>> \tvoid start(const ControlList &controls, ipa::RPi::StartConfig *startConfig) override;\n>> \tvoid stop() override {}\n>> \n>> -\tint configure(const CameraSensorInfo &sensorInfo,\n>> +\tint configure(const IPACameraSensorInfo &sensorInfo,\n>> \t\t const std::map &streamConfig,\n>> \t\t const std::map &entityControls,\n>> \t\t const ipa::RPi::IPAConfig &data,\n>> @@ -101,7 +101,7 @@ public:\n>> \tvoid signalIspPrepare(const ipa::RPi::ISPConfig &data) override;\n>> \n>> private:\n>> -\tvoid setMode(const CameraSensorInfo &sensorInfo);\n>> +\tvoid setMode(const IPACameraSensorInfo &sensorInfo);\n>> \tbool validateSensorControls();\n>> \tbool validateIspControls();\n>> \tvoid queueRequest(const ControlList &controls);\n>> @@ -278,7 +278,7 @@ void IPARPi::start(const ControlList &controls, ipa::RPi::StartConfig *startConf\n>> \tlastRunTimestamp_ = 0;\n>> }\n>> \n>> -void IPARPi::setMode(const CameraSensorInfo &sensorInfo)\n>> +void IPARPi::setMode(const IPACameraSensorInfo &sensorInfo)\n>> {\n>> \tmode_.bitdepth = sensorInfo.bitsPerPixel;\n>> \tmode_.width = sensorInfo.outputSize.width;\n>> @@ -323,7 +323,7 @@ void IPARPi::setMode(const CameraSensorInfo &sensorInfo)\n>> \tmode_.max_frame_length = sensorInfo.maxFrameLength;\n>> }\n>> \n>> -int IPARPi::configure(const CameraSensorInfo &sensorInfo,\n>> +int IPARPi::configure(const IPACameraSensorInfo &sensorInfo,\n>> \t\t [[maybe_unused]] const std::map &streamConfig,\n>> \t\t const std::map &entityControls,\n>> \t\t const ipa::RPi::IPAConfig &ipaConfig,\n>> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n>> index 6d45673c..b47ea324 100644\n>> --- a/src/ipa/rkisp1/rkisp1.cpp\n>> +++ b/src/ipa/rkisp1/rkisp1.cpp\n>> @@ -37,7 +37,7 @@ public:\n>> \tint start() override;\n>> \tvoid stop() override {}\n>> \n>> -\tint configure(const CameraSensorInfo &info,\n>> +\tint configure(const IPACameraSensorInfo &info,\n>> \t\t const std::map &streamConfig,\n>> \t\t const std::map &entityControls) override;\n>> \tvoid mapBuffers(const std::vector &buffers) override;\n>> @@ -90,12 +90,12 @@ int IPARkISP1::start()\n>> }\n>> \n>> /**\n>> - * \\todo The RkISP1 pipeline currently provides an empty CameraSensorInfo\n>> + * \\todo The RkISP1 pipeline currently provides an empty IPACameraSensorInfo\n>> * if the connected sensor does not provide enough information to properly\n>> * assemble one. Make sure the reported sensor information are relevant\n>> * before accessing them.\n>> */\n>> -int IPARkISP1::configure([[maybe_unused]] const CameraSensorInfo &info,\n>> +int IPARkISP1::configure([[maybe_unused]] const IPACameraSensorInfo &info,\n>> \t\t\t [[maybe_unused]] const std::map &streamConfig,\n>> \t\t\t const std::map &entityControls)\n>> {\n>> diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\n>> index 170de827..0fb8a258 100644\n>> --- a/src/libcamera/camera_sensor.cpp\n>> +++ b/src/libcamera/camera_sensor.cpp\n>> @@ -205,7 +205,7 @@ int CameraSensor::validateSensorDriver()\n>> \t *\n>> \t * Failures in reading any of the targets are not deemed to be fatal,\n>> \t * but some properties and features, like constructing a\n>> -\t * CameraSensorInfo for the IPA module, won't be supported.\n>> +\t * IPACameraSensorInfo for the IPA module, won't be supported.\n>> \t *\n>> \t * \\todo Make support for selection targets mandatory as soon as all\n>> \t * test platforms have been updated.\n>> @@ -674,7 +674,7 @@ int CameraSensor::setControls(ControlList *ctrls)\n>> *\n>> * \\return 0 on success, a negative error code otherwise\n>> */\n>> -int CameraSensor::sensorInfo(CameraSensorInfo *info) const\n>> +int CameraSensor::sensorInfo(IPACameraSensorInfo *info) const\n>> {\n>> \tif (!bayerFormat_)\n>> \t\treturn -EINVAL;\n>> @@ -701,7 +701,7 @@ int CameraSensor::sensorInfo(CameraSensorInfo *info) const\n>> \t}\n>> \n>> \t/*\n>> -\t * CameraSensorInfo::analogCrop::x and CameraSensorInfo::analogCrop::y\n>> +\t * IPACameraSensorInfo::analogCrop::x and IPACameraSensorInfo::analogCrop::y\n>> \t * are defined relatively to the active pixel area, while V4L2's\n>> \t * TGT_CROP target is defined in respect to the full pixel array.\n>> \t *\n>> diff --git a/src/libcamera/ipa/core_ipa_interface.cpp b/src/libcamera/ipa/core_ipa_interface.cpp\n>> index def8d184..15d61d91 100644\n>> --- a/src/libcamera/ipa/core_ipa_interface.cpp\n>> +++ b/src/libcamera/ipa/core_ipa_interface.cpp\n>> @@ -103,7 +103,7 @@ namespace libcamera {\n>> */\n>> \n>> /**\n>> - * \\struct CameraSensorInfo\n>> + * \\struct IPACameraSensorInfo\n>> * \\brief Report the image sensor characteristics\n>> *\n>> * The structure reports image sensor characteristics used by IPA modules to\n>> @@ -121,15 +121,15 @@ namespace libcamera {\n>> */\n>> \n>> /**\n>> - * \\fn CameraSensorInfo::CameraSensorInfo(const std::string &model,\n>> -\t\t\t\t\t uint32_t bitsPerPixel,\n>> -\t\t\t\t\t const Size &activeAreaSize,\n>> -\t\t\t\t\t const Rectangle &analogCrop,\n>> -\t\t\t\t\t const Size &outputSize,\n>> -\t\t\t\t\t uint64_t pixelRate,\n>> -\t\t\t\t\t uint32_t lineLength,\n>> -\t\t\t\t\t uint32_t minFrameLength,\n>> -\t\t\t\t\t uint32_t maxFrameLength)\n>> + * \\fn IPACameraSensorInfo::IPACameraSensorInfo(const std::string &model,\n>> +\t\t\t\t\t\tuint32_t bitsPerPixel,\n>> +\t\t\t\t\t\tconst Size &activeAreaSize,\n>> +\t\t\t\t\t\tconst Rectangle &analogCrop,\n>> +\t\t\t\t\t\tconst Size &outputSize,\n>> +\t\t\t\t\t\tuint64_t pixelRate,\n>> +\t\t\t\t\t\tuint32_t lineLength,\n>> +\t\t\t\t\t\tuint32_t minFrameLength,\n>> +\t\t\t\t\t\tuint32_t maxFrameLength)\n>> * \\param[in] model\n>> * \\param[in] bitsPerPixel\n>> * \\param[in] activeAreaSize\n>> @@ -142,7 +142,7 @@ namespace libcamera {\n>> */\n>> \n>> /**\n>> - * \\var CameraSensorInfo::model\n>> + * \\var IPACameraSensorInfo::model\n>> * \\brief The image sensor model name\n>> *\n>> * The sensor model name is a free-formed string that uniquely identifies the\n>> @@ -150,18 +150,18 @@ namespace libcamera {\n>> */\n>> \n>> /**\n>> - * \\var CameraSensorInfo::bitsPerPixel\n>> + * \\var IPACameraSensorInfo::bitsPerPixel\n>> * \\brief The number of bits per pixel of the image format produced by the\n>> * image sensor\n>> */\n>> \n>> /**\n>> - * \\var CameraSensorInfo::activeAreaSize\n>> + * \\var IPACameraSensorInfo::activeAreaSize\n>> * \\brief The size of the pixel array active area of the sensor\n>> */\n>> \n>> /**\n>> - * \\var CameraSensorInfo::analogCrop\n>> + * \\var IPACameraSensorInfo::analogCrop\n>> * \\brief The portion of the pixel array active area which is read-out and\n>> * processed\n>> *\n>> @@ -174,7 +174,7 @@ namespace libcamera {\n>> */\n>> \n>> /**\n>> - * \\var CameraSensorInfo::outputSize\n>> + * \\var IPACameraSensorInfo::outputSize\n>> * \\brief The size of the images produced by the camera sensor\n>> *\n>> * The output image size defines the horizontal and vertical sizes of the images\n>> @@ -187,7 +187,7 @@ namespace libcamera {\n>> */\n>> \n>> /**\n>> - * \\var CameraSensorInfo::pixelRate\n>> + * \\var IPACameraSensorInfo::pixelRate\n>> * \\brief The number of pixels produced in a second\n>> *\n>> * To obtain the read-out time in seconds of a full line:\n>> @@ -198,14 +198,14 @@ namespace libcamera {\n>> */\n>> \n>> /**\n>> - * \\var CameraSensorInfo::lineLength\n>> + * \\var IPACameraSensorInfo::lineLength\n>> * \\brief Total line length in pixels\n>> *\n>> * The total line length in pixel clock periods, including blanking.\n>> */\n>> \n>> /**\n>> - * \\var CameraSensorInfo::minFrameLength\n>> + * \\var IPACameraSensorInfo::minFrameLength\n>> * \\brief The minimum allowable frame length in units of lines\n>> *\n>> * The sensor frame length comprises of active output lines and blanking lines\n>> @@ -220,7 +220,7 @@ namespace libcamera {\n>> */\n>> \n>> /**\n>> - * \\var CameraSensorInfo::maxFrameLength\n>> + * \\var IPACameraSensorInfo::maxFrameLength\n>> * \\brief The maximum allowable frame length in units of lines\n>> *\n>> * The sensor frame length comprises of active output lines and blanking lines\n>> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n>> index ade8ffbd..98c6160f 100644\n>> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n>> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n>> @@ -544,7 +544,7 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n>> \tif (ret)\n>> \t\treturn ret;\n>> \n>> -\tCameraSensorInfo sensorInfo;\n>> +\tIPACameraSensorInfo sensorInfo;\n>> \tcio2->sensor()->sensorInfo(&sensorInfo);\n>> \tdata->cropRegion_ = sensorInfo.analogCrop;\n>> \n>> @@ -883,7 +883,7 @@ int PipelineHandlerIPU3::initControls(IPU3CameraData *data)\n>> \tif (ret)\n>> \t\treturn ret;\n>> \n>> -\tCameraSensorInfo sensorInfo{};\n>> +\tIPACameraSensorInfo sensorInfo{};\n>> \tret = sensor->sensorInfo(&sensorInfo);\n>> \tif (ret)\n>> \t\treturn ret;\n>> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n>> index 6fbdba04..f2a94dc0 100644\n>> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n>> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n>> @@ -211,7 +211,7 @@ public:\n>> \tBayerFormat::Order nativeBayerOrder_;\n>> \n>> \t/* For handling digital zoom. */\n>> -\tCameraSensorInfo sensorInfo_;\n>> +\tIPACameraSensorInfo sensorInfo_;\n>> \tRectangle ispCrop_; /* crop in ISP (camera mode) pixels */\n>> \tRectangle scalerCrop_; /* crop in sensor native pixels */\n>> \tbool updateScalerCrop_;\n>> @@ -1275,7 +1275,7 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)\n>> \t\tipaConfig.lsTableHandle = lsTable_;\n>> \t}\n>> \n>> -\t/* We store the CameraSensorInfo for digital zoom calculations. */\n>> +\t/* We store the IPACameraSensorInfo for digital zoom calculations. */\n>> \tint ret = sensor_->sensorInfo(&sensorInfo_);\n>> \tif (ret) {\n>> \t\tLOG(RPI, Error) << \"Failed to retrieve camera sensor info\";\n>> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n>> index adebe8b5..6699839c 100644\n>> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n>> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n>> @@ -648,7 +648,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n>> \t\treturn ret;\n>> \n>> \t/* Inform IPA of stream configuration and sensor controls. */\n>> -\tCameraSensorInfo sensorInfo = {};\n>> +\tIPACameraSensorInfo sensorInfo = {};\n>> \tret = data->sensor_->sensorInfo(&sensorInfo);\n>> \tif (ret) {\n>> \t\t/* \\todo Turn this into a hard failure. */\n>> -- \n>> 2.26.2\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 38CBAC31FB\n\tfor ;\n\tFri, 21 May 2021 09:01:23 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7D1B16891D;\n\tFri, 21 May 2021 11:01:22 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C328C68918\n\tfor ;\n\tFri, 21 May 2021 11:01:19 +0200 (CEST)","from [IPv6:2a01:e0a:169:7140:54a2:6f99:9b15:64bc] (unknown\n\t[IPv6:2a01:e0a:169:7140:54a2:6f99:9b15:64bc])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 155E08D8;\n\tFri, 21 May 2021 11:01:19 +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=\"l8CrpqG6\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1621587679;\n\tbh=Hk++N+9JZIrDqDmwEtl2ey8YxvuHg8qqxKdacwqbu0I=;\n\th=Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=l8CrpqG68Olgz6jRvbLlaRkBS728MoCv/oJu/nZBZLhn69R1bZbIbfQuxEhRatjCG\n\tKG5fCI1kX3tIkyesQ+VYrsZGX6mxS+LU38RpX4yQ915A24kga2JFbLhnn78VCVmHpB\n\tFlUVx9aJnjDXgs5St0Mk0S2Q4vicmpyflF8gdchs=","To":"paul.elder@ideasonboard.com, Umang Jain ","References":"<20210519101954.77711-1-umang.jain@ideasonboard.com>\n\t<20210519101954.77711-4-umang.jain@ideasonboard.com>\n\t<20210520025144.GD902042@pyrite.rasen.tech>","From":"Jean-Michel Hautbois ","Message-ID":"","Date":"Fri, 21 May 2021 11:01:18 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.8.1","MIME-Version":"1.0","In-Reply-To":"<20210520025144.GD902042@pyrite.rasen.tech>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH v2 3/7] ipa: ipc: Rename\n\tCameraSensorInfo to IPACameraSensorInfo","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","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":17064,"web_url":"https://patchwork.libcamera.org/comment/17064/","msgid":"<984495d2-4a4b-6195-49fb-c8348dcb44ae@ideasonboard.com>","date":"2021-05-21T09:03:20","subject":"Re: [libcamera-devel] [PATCH v2 3/7] ipa: ipc: Rename\n\tCameraSensorInfo to IPACameraSensorInfo","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Umang,\n\nOn 19/05/2021 11:19, Umang Jain wrote:\n> This matches the naming convention for IPA IPC.\n\nSounds good to me.\n\nReviewed-by: Kieran Bingham \n\n> Signed-off-by: Umang Jain \n> ---\n> Documentation/guides/ipa.rst | 8 ++--\n> include/libcamera/internal/camera_sensor.h | 2 +-\n> include/libcamera/ipa/core.mojom | 2 +-\n> include/libcamera/ipa/raspberrypi.mojom | 2 +-\n> include/libcamera/ipa/rkisp1.mojom | 2 +-\n> src/ipa/ipu3/ipu3_agc.cpp | 2 +-\n> src/ipa/raspberrypi/raspberrypi.cpp | 8 ++--\n> src/ipa/rkisp1/rkisp1.cpp | 6 +--\n> src/libcamera/camera_sensor.cpp | 6 +--\n> src/libcamera/ipa/core_ipa_interface.cpp | 38 +++++++++----------\n> src/libcamera/pipeline/ipu3/ipu3.cpp | 4 +-\n> .../pipeline/raspberrypi/raspberrypi.cpp | 4 +-\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n> 13 files changed, 43 insertions(+), 43 deletions(-)\n> \n> diff --git a/Documentation/guides/ipa.rst b/Documentation/guides/ipa.rst\n> index cbffbd9a..6d460e13 100644\n> --- a/Documentation/guides/ipa.rst\n> +++ b/Documentation/guides/ipa.rst\n> @@ -74,7 +74,7 @@ serialization, any custom data containers must be defined with the mojo IDL.\n> The following list of libcamera objects are supported in the interface\n> definition, and may be used as function parameter types or struct field types:\n> \n> -- libcamera.CameraSensorInfo\n> +- libcamera.IPACameraSensorInfo\n> - libcamera.ControlInfoMap\n> - libcamera.ControlList\n> - libcamera.FileDescriptor\n> @@ -208,7 +208,7 @@ The following is an example of a main interface definition:\n> start() => (int32 ret);\n> stop();\n> \n> - configure(libcamera.CameraSensorInfo sensorInfo,\n> + configure(libcamera.IPACameraSensorInfo sensorInfo,\n> map streamConfig,\n> map entityControls,\n> ConfigInput ipaConfig)\n> @@ -470,7 +470,7 @@ definition:\n> \n> .. code-block:: none\n> \n> - configure(libcamera.CameraSensorInfo sensorInfo,\n> + configure(libcamera.IPACameraSensorInfo sensorInfo,\n> uint32 exampleNumber,\n> map streamConfig,\n> map entityControls,\n> @@ -481,7 +481,7 @@ We will need to implement a function with the following function signature:\n> \n> .. code-block:: C++\n> \n> - int configure(const CameraSensorInfo &sensorInfo,\n> + int configure(const IPACameraSensorInfo &sensorInfo,\n> uint32_t exampleNumber,\n> const std::map &streamConfig,\n> const std::map &entityControls,\n> diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\n> index 0905ebfa..cf6c1c1e 100644\n> --- a/include/libcamera/internal/camera_sensor.h\n> +++ b/include/libcamera/internal/camera_sensor.h\n> @@ -51,7 +51,7 @@ public:\n> \tV4L2Subdevice *device() { return subdev_.get(); }\n> \n> \tconst ControlList &properties() const { return properties_; }\n> -\tint sensorInfo(CameraSensorInfo *info) const;\n> +\tint sensorInfo(IPACameraSensorInfo *info) const;\n> \n> \tvoid updateControlInfo();\n> \n> diff --git a/include/libcamera/ipa/core.mojom b/include/libcamera/ipa/core.mojom\n> index b95b3dc4..34a799c2 100644\n> --- a/include/libcamera/ipa/core.mojom\n> +++ b/include/libcamera/ipa/core.mojom\n> @@ -78,7 +78,7 @@ module libcamera;\n> \tuint32 height;\n> };\n> \n> -struct CameraSensorInfo {\n> +struct IPACameraSensorInfo {\n> \tstring model;\n> \n> \tuint32 bitsPerPixel;\n> diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom\n> index 42321bee..0a21f453 100644\n> --- a/include/libcamera/ipa/raspberrypi.mojom\n> +++ b/include/libcamera/ipa/raspberrypi.mojom\n> @@ -63,7 +63,7 @@ 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(libcamera.CameraSensorInfo sensorInfo,\n> +\tconfigure(libcamera.IPACameraSensorInfo sensorInfo,\n> \t\t map streamConfig,\n> \t\t map entityControls,\n> \t\t IPAConfig ipaConfig)\n> diff --git a/include/libcamera/ipa/rkisp1.mojom b/include/libcamera/ipa/rkisp1.mojom\n> index cca871a0..66a4607c 100644\n> --- a/include/libcamera/ipa/rkisp1.mojom\n> +++ b/include/libcamera/ipa/rkisp1.mojom\n> @@ -29,7 +29,7 @@ interface IPARkISP1Interface {\n> \tstart() => (int32 ret);\n> \tstop();\n> \n> -\tconfigure(libcamera.CameraSensorInfo sensorInfo,\n> +\tconfigure(libcamera.IPACameraSensorInfo sensorInfo,\n> \t\t map streamConfig,\n> \t\t map entityControls)\n> \t\t=> (int32 ret);\n> diff --git a/src/ipa/ipu3/ipu3_agc.cpp b/src/ipa/ipu3/ipu3_agc.cpp\n> index ca54d89a..8bae423f 100644\n> --- a/src/ipa/ipu3/ipu3_agc.cpp\n> +++ b/src/ipa/ipu3/ipu3_agc.cpp\n> @@ -39,7 +39,7 @@ static constexpr uint32_t kMaxGain = kMaxISO / 100;\n> static constexpr uint32_t kMinExposure = 1;\n> static constexpr uint32_t kMaxExposure = 1976;\n> \n> -/* \\todo those should be get from CameraSensorInfo ! */\n> +/* \\todo those should be got from IPACameraSensorInfo ! */\n> /* line duration in microseconds */\n> static constexpr double kLineDuration = 16.8;\n> static constexpr double kMaxExposureTime = kMaxExposure * kLineDuration;\n> diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\n> index 87774500..e5bb8159 100644\n> --- a/src/ipa/raspberrypi/raspberrypi.cpp\n> +++ b/src/ipa/raspberrypi/raspberrypi.cpp\n> @@ -89,7 +89,7 @@ public:\n> \tvoid start(const ControlList &controls, ipa::RPi::StartConfig *startConfig) override;\n> \tvoid stop() override {}\n> \n> -\tint configure(const CameraSensorInfo &sensorInfo,\n> +\tint configure(const IPACameraSensorInfo &sensorInfo,\n> \t\t const std::map &streamConfig,\n> \t\t const std::map &entityControls,\n> \t\t const ipa::RPi::IPAConfig &data,\n> @@ -101,7 +101,7 @@ public:\n> \tvoid signalIspPrepare(const ipa::RPi::ISPConfig &data) override;\n> \n> private:\n> -\tvoid setMode(const CameraSensorInfo &sensorInfo);\n> +\tvoid setMode(const IPACameraSensorInfo &sensorInfo);\n> \tbool validateSensorControls();\n> \tbool validateIspControls();\n> \tvoid queueRequest(const ControlList &controls);\n> @@ -278,7 +278,7 @@ void IPARPi::start(const ControlList &controls, ipa::RPi::StartConfig *startConf\n> \tlastRunTimestamp_ = 0;\n> }\n> \n> -void IPARPi::setMode(const CameraSensorInfo &sensorInfo)\n> +void IPARPi::setMode(const IPACameraSensorInfo &sensorInfo)\n> {\n> \tmode_.bitdepth = sensorInfo.bitsPerPixel;\n> \tmode_.width = sensorInfo.outputSize.width;\n> @@ -323,7 +323,7 @@ void IPARPi::setMode(const CameraSensorInfo &sensorInfo)\n> \tmode_.max_frame_length = sensorInfo.maxFrameLength;\n> }\n> \n> -int IPARPi::configure(const CameraSensorInfo &sensorInfo,\n> +int IPARPi::configure(const IPACameraSensorInfo &sensorInfo,\n> \t\t [[maybe_unused]] const std::map &streamConfig,\n> \t\t const std::map &entityControls,\n> \t\t const ipa::RPi::IPAConfig &ipaConfig,\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index 6d45673c..b47ea324 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -37,7 +37,7 @@ public:\n> \tint start() override;\n> \tvoid stop() override {}\n> \n> -\tint configure(const CameraSensorInfo &info,\n> +\tint configure(const IPACameraSensorInfo &info,\n> \t\t const std::map &streamConfig,\n> \t\t const std::map &entityControls) override;\n> \tvoid mapBuffers(const std::vector &buffers) override;\n> @@ -90,12 +90,12 @@ int IPARkISP1::start()\n> }\n> \n> /**\n> - * \\todo The RkISP1 pipeline currently provides an empty CameraSensorInfo\n> + * \\todo The RkISP1 pipeline currently provides an empty IPACameraSensorInfo\n> * if the connected sensor does not provide enough information to properly\n> * assemble one. Make sure the reported sensor information are relevant\n> * before accessing them.\n> */\n> -int IPARkISP1::configure([[maybe_unused]] const CameraSensorInfo &info,\n> +int IPARkISP1::configure([[maybe_unused]] const IPACameraSensorInfo &info,\n> \t\t\t [[maybe_unused]] const std::map &streamConfig,\n> \t\t\t const std::map &entityControls)\n> {\n> diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\n> index 170de827..0fb8a258 100644\n> --- a/src/libcamera/camera_sensor.cpp\n> +++ b/src/libcamera/camera_sensor.cpp\n> @@ -205,7 +205,7 @@ int CameraSensor::validateSensorDriver()\n> \t *\n> \t * Failures in reading any of the targets are not deemed to be fatal,\n> \t * but some properties and features, like constructing a\n> -\t * CameraSensorInfo for the IPA module, won't be supported.\n> +\t * IPACameraSensorInfo for the IPA module, won't be supported.\n> \t *\n> \t * \\todo Make support for selection targets mandatory as soon as all\n> \t * test platforms have been updated.\n> @@ -674,7 +674,7 @@ int CameraSensor::setControls(ControlList *ctrls)\n> *\n> * \\return 0 on success, a negative error code otherwise\n> */\n> -int CameraSensor::sensorInfo(CameraSensorInfo *info) const\n> +int CameraSensor::sensorInfo(IPACameraSensorInfo *info) const\n> {\n> \tif (!bayerFormat_)\n> \t\treturn -EINVAL;\n> @@ -701,7 +701,7 @@ int CameraSensor::sensorInfo(CameraSensorInfo *info) const\n> \t}\n> \n> \t/*\n> -\t * CameraSensorInfo::analogCrop::x and CameraSensorInfo::analogCrop::y\n> +\t * IPACameraSensorInfo::analogCrop::x and IPACameraSensorInfo::analogCrop::y\n> \t * are defined relatively to the active pixel area, while V4L2's\n> \t * TGT_CROP target is defined in respect to the full pixel array.\n> \t *\n> diff --git a/src/libcamera/ipa/core_ipa_interface.cpp b/src/libcamera/ipa/core_ipa_interface.cpp\n> index def8d184..15d61d91 100644\n> --- a/src/libcamera/ipa/core_ipa_interface.cpp\n> +++ b/src/libcamera/ipa/core_ipa_interface.cpp\n> @@ -103,7 +103,7 @@ namespace libcamera {\n> */\n> \n> /**\n> - * \\struct CameraSensorInfo\n> + * \\struct IPACameraSensorInfo\n> * \\brief Report the image sensor characteristics\n> *\n> * The structure reports image sensor characteristics used by IPA modules to\n> @@ -121,15 +121,15 @@ namespace libcamera {\n> */\n> \n> /**\n> - * \\fn CameraSensorInfo::CameraSensorInfo(const std::string &model,\n> -\t\t\t\t\t uint32_t bitsPerPixel,\n> -\t\t\t\t\t const Size &activeAreaSize,\n> -\t\t\t\t\t const Rectangle &analogCrop,\n> -\t\t\t\t\t const Size &outputSize,\n> -\t\t\t\t\t uint64_t pixelRate,\n> -\t\t\t\t\t uint32_t lineLength,\n> -\t\t\t\t\t uint32_t minFrameLength,\n> -\t\t\t\t\t uint32_t maxFrameLength)\n> + * \\fn IPACameraSensorInfo::IPACameraSensorInfo(const std::string &model,\n> +\t\t\t\t\t\tuint32_t bitsPerPixel,\n> +\t\t\t\t\t\tconst Size &activeAreaSize,\n> +\t\t\t\t\t\tconst Rectangle &analogCrop,\n> +\t\t\t\t\t\tconst Size &outputSize,\n> +\t\t\t\t\t\tuint64_t pixelRate,\n> +\t\t\t\t\t\tuint32_t lineLength,\n> +\t\t\t\t\t\tuint32_t minFrameLength,\n> +\t\t\t\t\t\tuint32_t maxFrameLength)\n> * \\param[in] model\n> * \\param[in] bitsPerPixel\n> * \\param[in] activeAreaSize\n> @@ -142,7 +142,7 @@ namespace libcamera {\n> */\n> \n> /**\n> - * \\var CameraSensorInfo::model\n> + * \\var IPACameraSensorInfo::model\n> * \\brief The image sensor model name\n> *\n> * The sensor model name is a free-formed string that uniquely identifies the\n> @@ -150,18 +150,18 @@ namespace libcamera {\n> */\n> \n> /**\n> - * \\var CameraSensorInfo::bitsPerPixel\n> + * \\var IPACameraSensorInfo::bitsPerPixel\n> * \\brief The number of bits per pixel of the image format produced by the\n> * image sensor\n> */\n> \n> /**\n> - * \\var CameraSensorInfo::activeAreaSize\n> + * \\var IPACameraSensorInfo::activeAreaSize\n> * \\brief The size of the pixel array active area of the sensor\n> */\n> \n> /**\n> - * \\var CameraSensorInfo::analogCrop\n> + * \\var IPACameraSensorInfo::analogCrop\n> * \\brief The portion of the pixel array active area which is read-out and\n> * processed\n> *\n> @@ -174,7 +174,7 @@ namespace libcamera {\n> */\n> \n> /**\n> - * \\var CameraSensorInfo::outputSize\n> + * \\var IPACameraSensorInfo::outputSize\n> * \\brief The size of the images produced by the camera sensor\n> *\n> * The output image size defines the horizontal and vertical sizes of the images\n> @@ -187,7 +187,7 @@ namespace libcamera {\n> */\n> \n> /**\n> - * \\var CameraSensorInfo::pixelRate\n> + * \\var IPACameraSensorInfo::pixelRate\n> * \\brief The number of pixels produced in a second\n> *\n> * To obtain the read-out time in seconds of a full line:\n> @@ -198,14 +198,14 @@ namespace libcamera {\n> */\n> \n> /**\n> - * \\var CameraSensorInfo::lineLength\n> + * \\var IPACameraSensorInfo::lineLength\n> * \\brief Total line length in pixels\n> *\n> * The total line length in pixel clock periods, including blanking.\n> */\n> \n> /**\n> - * \\var CameraSensorInfo::minFrameLength\n> + * \\var IPACameraSensorInfo::minFrameLength\n> * \\brief The minimum allowable frame length in units of lines\n> *\n> * The sensor frame length comprises of active output lines and blanking lines\n> @@ -220,7 +220,7 @@ namespace libcamera {\n> */\n> \n> /**\n> - * \\var CameraSensorInfo::maxFrameLength\n> + * \\var IPACameraSensorInfo::maxFrameLength\n> * \\brief The maximum allowable frame length in units of lines\n> *\n> * The sensor frame length comprises of active output lines and blanking lines\n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index ade8ffbd..98c6160f 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -544,7 +544,7 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n> \tif (ret)\n> \t\treturn ret;\n> \n> -\tCameraSensorInfo sensorInfo;\n> +\tIPACameraSensorInfo sensorInfo;\n> \tcio2->sensor()->sensorInfo(&sensorInfo);\n> \tdata->cropRegion_ = sensorInfo.analogCrop;\n> \n> @@ -883,7 +883,7 @@ int PipelineHandlerIPU3::initControls(IPU3CameraData *data)\n> \tif (ret)\n> \t\treturn ret;\n> \n> -\tCameraSensorInfo sensorInfo{};\n> +\tIPACameraSensorInfo sensorInfo{};\n> \tret = sensor->sensorInfo(&sensorInfo);\n> \tif (ret)\n> \t\treturn ret;\n> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> index 6fbdba04..f2a94dc0 100644\n> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> @@ -211,7 +211,7 @@ public:\n> \tBayerFormat::Order nativeBayerOrder_;\n> \n> \t/* For handling digital zoom. */\n> -\tCameraSensorInfo sensorInfo_;\n> +\tIPACameraSensorInfo sensorInfo_;\n> \tRectangle ispCrop_; /* crop in ISP (camera mode) pixels */\n> \tRectangle scalerCrop_; /* crop in sensor native pixels */\n> \tbool updateScalerCrop_;\n> @@ -1275,7 +1275,7 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)\n> \t\tipaConfig.lsTableHandle = lsTable_;\n> \t}\n> \n> -\t/* We store the CameraSensorInfo for digital zoom calculations. */\n> +\t/* We store the IPACameraSensorInfo for digital zoom calculations. */\n> \tint ret = sensor_->sensorInfo(&sensorInfo_);\n> \tif (ret) {\n> \t\tLOG(RPI, Error) << \"Failed to retrieve camera sensor info\";\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index adebe8b5..6699839c 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -648,7 +648,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n> \t\treturn ret;\n> \n> \t/* Inform IPA of stream configuration and sensor controls. */\n> -\tCameraSensorInfo sensorInfo = {};\n> +\tIPACameraSensorInfo sensorInfo = {};\n> \tret = data->sensor_->sensorInfo(&sensorInfo);\n> \tif (ret) {\n> \t\t/* \\todo Turn this into a hard failure. */\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 2CD8EC31FF\n\tfor ;\n\tFri, 21 May 2021 09:03:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CC1C46891B;\n\tFri, 21 May 2021 11:03:24 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5C31C68918\n\tfor ;\n\tFri, 21 May 2021 11:03:23 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id F39DF8D8;\n\tFri, 21 May 2021 11:03:22 +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=\"Ikci94Du\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1621587803;\n\tbh=TCNeaXGIIlpcUm5utJMwDMrn2nXgtFjcjv/Fe8uXuJU=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=Ikci94DuvRiJiAX+gf80XMS90zRnzdflEiBeuxRAYXDyogbBWCdmC5+mF6+uHPsDo\n\to9JueVh0ecxI17FrttDTN7H1iasptmhuyiDl1/n1ddF/EvyupSSGKTSCdvPj+BY7jr\n\ta6uBTgKNG1P16Xk42ZcKexEw9v7A6nJ5zvnoDf2U=","To":"Umang Jain ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210519101954.77711-1-umang.jain@ideasonboard.com>\n\t<20210519101954.77711-4-umang.jain@ideasonboard.com>","From":"Kieran Bingham ","Organization":"Ideas on Board","Message-ID":"<984495d2-4a4b-6195-49fb-c8348dcb44ae@ideasonboard.com>","Date":"Fri, 21 May 2021 10:03:20 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.8.1","MIME-Version":"1.0","In-Reply-To":"<20210519101954.77711-4-umang.jain@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH v2 3/7] ipa: ipc: Rename\n\tCameraSensorInfo to IPACameraSensorInfo","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","Reply-To":"kieran.bingham@ideasonboard.com","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":17074,"web_url":"https://patchwork.libcamera.org/comment/17074/","msgid":"<20210521093305.gfluc7ax566phdg4@uno.localdomain>","date":"2021-05-21T09:33:05","subject":"Re: [libcamera-devel] [PATCH v2 3/7] ipa: ipc: Rename\n\tCameraSensorInfo to IPACameraSensorInfo","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"On Wed, May 19, 2021 at 03:49:50PM +0530, Umang Jain wrote:\n> This matches the naming convention for IPA IPC.\n\nI wonder, now that we moved the stuct out of CameraSensor, would\nIPASensorInfo be a better fit ?\n\n>\n> Signed-off-by: Umang Jain \n> ---\n> Documentation/guides/ipa.rst | 8 ++--\n> include/libcamera/internal/camera_sensor.h | 2 +-\n> include/libcamera/ipa/core.mojom | 2 +-\n> include/libcamera/ipa/raspberrypi.mojom | 2 +-\n> include/libcamera/ipa/rkisp1.mojom | 2 +-\n> src/ipa/ipu3/ipu3_agc.cpp | 2 +-\n> src/ipa/raspberrypi/raspberrypi.cpp | 8 ++--\n> src/ipa/rkisp1/rkisp1.cpp | 6 +--\n> src/libcamera/camera_sensor.cpp | 6 +--\n> src/libcamera/ipa/core_ipa_interface.cpp | 38 +++++++++----------\n> src/libcamera/pipeline/ipu3/ipu3.cpp | 4 +-\n> .../pipeline/raspberrypi/raspberrypi.cpp | 4 +-\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n> 13 files changed, 43 insertions(+), 43 deletions(-)\n>\n> diff --git a/Documentation/guides/ipa.rst b/Documentation/guides/ipa.rst\n> index cbffbd9a..6d460e13 100644\n> --- a/Documentation/guides/ipa.rst\n> +++ b/Documentation/guides/ipa.rst\n> @@ -74,7 +74,7 @@ serialization, any custom data containers must be defined with the mojo IDL.\n> The following list of libcamera objects are supported in the interface\n> definition, and may be used as function parameter types or struct field types:\n>\n> -- libcamera.CameraSensorInfo\n> +- libcamera.IPACameraSensorInfo\n> - libcamera.ControlInfoMap\n> - libcamera.ControlList\n> - libcamera.FileDescriptor\n> @@ -208,7 +208,7 @@ The following is an example of a main interface definition:\n> start() => (int32 ret);\n> stop();\n>\n> - configure(libcamera.CameraSensorInfo sensorInfo,\n> + configure(libcamera.IPACameraSensorInfo sensorInfo,\n> map streamConfig,\n> map entityControls,\n> ConfigInput ipaConfig)\n> @@ -470,7 +470,7 @@ definition:\n>\n> .. code-block:: none\n>\n> - configure(libcamera.CameraSensorInfo sensorInfo,\n> + configure(libcamera.IPACameraSensorInfo sensorInfo,\n> uint32 exampleNumber,\n> map streamConfig,\n> map entityControls,\n> @@ -481,7 +481,7 @@ We will need to implement a function with the following function signature:\n>\n> .. code-block:: C++\n>\n> - int configure(const CameraSensorInfo &sensorInfo,\n> + int configure(const IPACameraSensorInfo &sensorInfo,\n> uint32_t exampleNumber,\n> const std::map &streamConfig,\n> const std::map &entityControls,\n> diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\n> index 0905ebfa..cf6c1c1e 100644\n> --- a/include/libcamera/internal/camera_sensor.h\n> +++ b/include/libcamera/internal/camera_sensor.h\n> @@ -51,7 +51,7 @@ public:\n> \tV4L2Subdevice *device() { return subdev_.get(); }\n>\n> \tconst ControlList &properties() const { return properties_; }\n> -\tint sensorInfo(CameraSensorInfo *info) const;\n> +\tint sensorInfo(IPACameraSensorInfo *info) const;\n>\n> \tvoid updateControlInfo();\n>\n> diff --git a/include/libcamera/ipa/core.mojom b/include/libcamera/ipa/core.mojom\n> index b95b3dc4..34a799c2 100644\n> --- a/include/libcamera/ipa/core.mojom\n> +++ b/include/libcamera/ipa/core.mojom\n> @@ -78,7 +78,7 @@ module libcamera;\n> \tuint32 height;\n> };\n>\n> -struct CameraSensorInfo {\n> +struct IPACameraSensorInfo {\n> \tstring model;\n>\n> \tuint32 bitsPerPixel;\n> diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom\n> index 42321bee..0a21f453 100644\n> --- a/include/libcamera/ipa/raspberrypi.mojom\n> +++ b/include/libcamera/ipa/raspberrypi.mojom\n> @@ -63,7 +63,7 @@ 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(libcamera.CameraSensorInfo sensorInfo,\n> +\tconfigure(libcamera.IPACameraSensorInfo sensorInfo,\n> \t\t map streamConfig,\n> \t\t map entityControls,\n> \t\t IPAConfig ipaConfig)\n> diff --git a/include/libcamera/ipa/rkisp1.mojom b/include/libcamera/ipa/rkisp1.mojom\n> index cca871a0..66a4607c 100644\n> --- a/include/libcamera/ipa/rkisp1.mojom\n> +++ b/include/libcamera/ipa/rkisp1.mojom\n> @@ -29,7 +29,7 @@ interface IPARkISP1Interface {\n> \tstart() => (int32 ret);\n> \tstop();\n>\n> -\tconfigure(libcamera.CameraSensorInfo sensorInfo,\n> +\tconfigure(libcamera.IPACameraSensorInfo sensorInfo,\n> \t\t map streamConfig,\n> \t\t map entityControls)\n> \t\t=> (int32 ret);\n> diff --git a/src/ipa/ipu3/ipu3_agc.cpp b/src/ipa/ipu3/ipu3_agc.cpp\n> index ca54d89a..8bae423f 100644\n> --- a/src/ipa/ipu3/ipu3_agc.cpp\n> +++ b/src/ipa/ipu3/ipu3_agc.cpp\n> @@ -39,7 +39,7 @@ static constexpr uint32_t kMaxGain = kMaxISO / 100;\n> static constexpr uint32_t kMinExposure = 1;\n> static constexpr uint32_t kMaxExposure = 1976;\n>\n> -/* \\todo those should be get from CameraSensorInfo ! */\n> +/* \\todo those should be got from IPACameraSensorInfo ! */\n> /* line duration in microseconds */\n> static constexpr double kLineDuration = 16.8;\n> static constexpr double kMaxExposureTime = kMaxExposure * kLineDuration;\n> diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\n> index 87774500..e5bb8159 100644\n> --- a/src/ipa/raspberrypi/raspberrypi.cpp\n> +++ b/src/ipa/raspberrypi/raspberrypi.cpp\n> @@ -89,7 +89,7 @@ public:\n> \tvoid start(const ControlList &controls, ipa::RPi::StartConfig *startConfig) override;\n> \tvoid stop() override {}\n>\n> -\tint configure(const CameraSensorInfo &sensorInfo,\n> +\tint configure(const IPACameraSensorInfo &sensorInfo,\n> \t\t const std::map &streamConfig,\n> \t\t const std::map &entityControls,\n> \t\t const ipa::RPi::IPAConfig &data,\n> @@ -101,7 +101,7 @@ public:\n> \tvoid signalIspPrepare(const ipa::RPi::ISPConfig &data) override;\n>\n> private:\n> -\tvoid setMode(const CameraSensorInfo &sensorInfo);\n> +\tvoid setMode(const IPACameraSensorInfo &sensorInfo);\n> \tbool validateSensorControls();\n> \tbool validateIspControls();\n> \tvoid queueRequest(const ControlList &controls);\n> @@ -278,7 +278,7 @@ void IPARPi::start(const ControlList &controls, ipa::RPi::StartConfig *startConf\n> \tlastRunTimestamp_ = 0;\n> }\n>\n> -void IPARPi::setMode(const CameraSensorInfo &sensorInfo)\n> +void IPARPi::setMode(const IPACameraSensorInfo &sensorInfo)\n> {\n> \tmode_.bitdepth = sensorInfo.bitsPerPixel;\n> \tmode_.width = sensorInfo.outputSize.width;\n> @@ -323,7 +323,7 @@ void IPARPi::setMode(const CameraSensorInfo &sensorInfo)\n> \tmode_.max_frame_length = sensorInfo.maxFrameLength;\n> }\n>\n> -int IPARPi::configure(const CameraSensorInfo &sensorInfo,\n> +int IPARPi::configure(const IPACameraSensorInfo &sensorInfo,\n> \t\t [[maybe_unused]] const std::map &streamConfig,\n> \t\t const std::map &entityControls,\n> \t\t const ipa::RPi::IPAConfig &ipaConfig,\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index 6d45673c..b47ea324 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -37,7 +37,7 @@ public:\n> \tint start() override;\n> \tvoid stop() override {}\n>\n> -\tint configure(const CameraSensorInfo &info,\n> +\tint configure(const IPACameraSensorInfo &info,\n> \t\t const std::map &streamConfig,\n> \t\t const std::map &entityControls) override;\n> \tvoid mapBuffers(const std::vector &buffers) override;\n> @@ -90,12 +90,12 @@ int IPARkISP1::start()\n> }\n>\n> /**\n> - * \\todo The RkISP1 pipeline currently provides an empty CameraSensorInfo\n> + * \\todo The RkISP1 pipeline currently provides an empty IPACameraSensorInfo\n> * if the connected sensor does not provide enough information to properly\n> * assemble one. Make sure the reported sensor information are relevant\n> * before accessing them.\n> */\n> -int IPARkISP1::configure([[maybe_unused]] const CameraSensorInfo &info,\n> +int IPARkISP1::configure([[maybe_unused]] const IPACameraSensorInfo &info,\n> \t\t\t [[maybe_unused]] const std::map &streamConfig,\n> \t\t\t const std::map &entityControls)\n> {\n> diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\n> index 170de827..0fb8a258 100644\n> --- a/src/libcamera/camera_sensor.cpp\n> +++ b/src/libcamera/camera_sensor.cpp\n> @@ -205,7 +205,7 @@ int CameraSensor::validateSensorDriver()\n> \t *\n> \t * Failures in reading any of the targets are not deemed to be fatal,\n> \t * but some properties and features, like constructing a\n> -\t * CameraSensorInfo for the IPA module, won't be supported.\n> +\t * IPACameraSensorInfo for the IPA module, won't be supported.\n> \t *\n> \t * \\todo Make support for selection targets mandatory as soon as all\n> \t * test platforms have been updated.\n> @@ -674,7 +674,7 @@ int CameraSensor::setControls(ControlList *ctrls)\n> *\n> * \\return 0 on success, a negative error code otherwise\n> */\n> -int CameraSensor::sensorInfo(CameraSensorInfo *info) const\n> +int CameraSensor::sensorInfo(IPACameraSensorInfo *info) const\n> {\n> \tif (!bayerFormat_)\n> \t\treturn -EINVAL;\n> @@ -701,7 +701,7 @@ int CameraSensor::sensorInfo(CameraSensorInfo *info) const\n> \t}\n>\n> \t/*\n> -\t * CameraSensorInfo::analogCrop::x and CameraSensorInfo::analogCrop::y\n> +\t * IPACameraSensorInfo::analogCrop::x and IPACameraSensorInfo::analogCrop::y\n> \t * are defined relatively to the active pixel area, while V4L2's\n> \t * TGT_CROP target is defined in respect to the full pixel array.\n> \t *\n> diff --git a/src/libcamera/ipa/core_ipa_interface.cpp b/src/libcamera/ipa/core_ipa_interface.cpp\n> index def8d184..15d61d91 100644\n> --- a/src/libcamera/ipa/core_ipa_interface.cpp\n> +++ b/src/libcamera/ipa/core_ipa_interface.cpp\n> @@ -103,7 +103,7 @@ namespace libcamera {\n> */\n>\n> /**\n> - * \\struct CameraSensorInfo\n> + * \\struct IPACameraSensorInfo\n> * \\brief Report the image sensor characteristics\n> *\n> * The structure reports image sensor characteristics used by IPA modules to\n> @@ -121,15 +121,15 @@ namespace libcamera {\n> */\n>\n> /**\n> - * \\fn CameraSensorInfo::CameraSensorInfo(const std::string &model,\n> -\t\t\t\t\t uint32_t bitsPerPixel,\n> -\t\t\t\t\t const Size &activeAreaSize,\n> -\t\t\t\t\t const Rectangle &analogCrop,\n> -\t\t\t\t\t const Size &outputSize,\n> -\t\t\t\t\t uint64_t pixelRate,\n> -\t\t\t\t\t uint32_t lineLength,\n> -\t\t\t\t\t uint32_t minFrameLength,\n> -\t\t\t\t\t uint32_t maxFrameLength)\n> + * \\fn IPACameraSensorInfo::IPACameraSensorInfo(const std::string &model,\n> +\t\t\t\t\t\tuint32_t bitsPerPixel,\n> +\t\t\t\t\t\tconst Size &activeAreaSize,\n> +\t\t\t\t\t\tconst Rectangle &analogCrop,\n> +\t\t\t\t\t\tconst Size &outputSize,\n> +\t\t\t\t\t\tuint64_t pixelRate,\n> +\t\t\t\t\t\tuint32_t lineLength,\n> +\t\t\t\t\t\tuint32_t minFrameLength,\n> +\t\t\t\t\t\tuint32_t maxFrameLength)\n> * \\param[in] model\n> * \\param[in] bitsPerPixel\n> * \\param[in] activeAreaSize\n> @@ -142,7 +142,7 @@ namespace libcamera {\n> */\n>\n> /**\n> - * \\var CameraSensorInfo::model\n> + * \\var IPACameraSensorInfo::model\n> * \\brief The image sensor model name\n> *\n> * The sensor model name is a free-formed string that uniquely identifies the\n> @@ -150,18 +150,18 @@ namespace libcamera {\n> */\n>\n> /**\n> - * \\var CameraSensorInfo::bitsPerPixel\n> + * \\var IPACameraSensorInfo::bitsPerPixel\n> * \\brief The number of bits per pixel of the image format produced by the\n> * image sensor\n> */\n>\n> /**\n> - * \\var CameraSensorInfo::activeAreaSize\n> + * \\var IPACameraSensorInfo::activeAreaSize\n> * \\brief The size of the pixel array active area of the sensor\n> */\n>\n> /**\n> - * \\var CameraSensorInfo::analogCrop\n> + * \\var IPACameraSensorInfo::analogCrop\n> * \\brief The portion of the pixel array active area which is read-out and\n> * processed\n> *\n> @@ -174,7 +174,7 @@ namespace libcamera {\n> */\n>\n> /**\n> - * \\var CameraSensorInfo::outputSize\n> + * \\var IPACameraSensorInfo::outputSize\n> * \\brief The size of the images produced by the camera sensor\n> *\n> * The output image size defines the horizontal and vertical sizes of the images\n> @@ -187,7 +187,7 @@ namespace libcamera {\n> */\n>\n> /**\n> - * \\var CameraSensorInfo::pixelRate\n> + * \\var IPACameraSensorInfo::pixelRate\n> * \\brief The number of pixels produced in a second\n> *\n> * To obtain the read-out time in seconds of a full line:\n> @@ -198,14 +198,14 @@ namespace libcamera {\n> */\n>\n> /**\n> - * \\var CameraSensorInfo::lineLength\n> + * \\var IPACameraSensorInfo::lineLength\n> * \\brief Total line length in pixels\n> *\n> * The total line length in pixel clock periods, including blanking.\n> */\n>\n> /**\n> - * \\var CameraSensorInfo::minFrameLength\n> + * \\var IPACameraSensorInfo::minFrameLength\n> * \\brief The minimum allowable frame length in units of lines\n> *\n> * The sensor frame length comprises of active output lines and blanking lines\n> @@ -220,7 +220,7 @@ namespace libcamera {\n> */\n>\n> /**\n> - * \\var CameraSensorInfo::maxFrameLength\n> + * \\var IPACameraSensorInfo::maxFrameLength\n> * \\brief The maximum allowable frame length in units of lines\n> *\n> * The sensor frame length comprises of active output lines and blanking lines\n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index ade8ffbd..98c6160f 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -544,7 +544,7 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n> \tif (ret)\n> \t\treturn ret;\n>\n> -\tCameraSensorInfo sensorInfo;\n> +\tIPACameraSensorInfo sensorInfo;\n> \tcio2->sensor()->sensorInfo(&sensorInfo);\n> \tdata->cropRegion_ = sensorInfo.analogCrop;\n>\n> @@ -883,7 +883,7 @@ int PipelineHandlerIPU3::initControls(IPU3CameraData *data)\n> \tif (ret)\n> \t\treturn ret;\n>\n> -\tCameraSensorInfo sensorInfo{};\n> +\tIPACameraSensorInfo sensorInfo{};\n> \tret = sensor->sensorInfo(&sensorInfo);\n> \tif (ret)\n> \t\treturn ret;\n> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> index 6fbdba04..f2a94dc0 100644\n> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> @@ -211,7 +211,7 @@ public:\n> \tBayerFormat::Order nativeBayerOrder_;\n>\n> \t/* For handling digital zoom. */\n> -\tCameraSensorInfo sensorInfo_;\n> +\tIPACameraSensorInfo sensorInfo_;\n> \tRectangle ispCrop_; /* crop in ISP (camera mode) pixels */\n> \tRectangle scalerCrop_; /* crop in sensor native pixels */\n> \tbool updateScalerCrop_;\n> @@ -1275,7 +1275,7 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)\n> \t\tipaConfig.lsTableHandle = lsTable_;\n> \t}\n>\n> -\t/* We store the CameraSensorInfo for digital zoom calculations. */\n> +\t/* We store the IPACameraSensorInfo for digital zoom calculations. */\n> \tint ret = sensor_->sensorInfo(&sensorInfo_);\n> \tif (ret) {\n> \t\tLOG(RPI, Error) << \"Failed to retrieve camera sensor info\";\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index adebe8b5..6699839c 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -648,7 +648,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n> \t\treturn ret;\n>\n> \t/* Inform IPA of stream configuration and sensor controls. */\n> -\tCameraSensorInfo sensorInfo = {};\n> +\tIPACameraSensorInfo sensorInfo = {};\n> \tret = data->sensor_->sensorInfo(&sensorInfo);\n> \tif (ret) {\n> \t\t/* \\todo Turn this into a hard failure. */\n> --\n> 2.26.2\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 8BBE8C31FF\n\tfor ;\n\tFri, 21 May 2021 09:32:21 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E5FC66891D;\n\tFri, 21 May 2021 11:32:20 +0200 (CEST)","from relay12.mail.gandi.net (relay12.mail.gandi.net\n\t[217.70.178.232])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8EC1F68918\n\tfor ;\n\tFri, 21 May 2021 11:32:19 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby relay12.mail.gandi.net (Postfix) with ESMTPSA id ED5D3200002;\n\tFri, 21 May 2021 09:32:18 +0000 (UTC)"],"Date":"Fri, 21 May 2021 11:33:05 +0200","From":"Jacopo Mondi ","To":"Umang Jain ","Message-ID":"<20210521093305.gfluc7ax566phdg4@uno.localdomain>","References":"<20210519101954.77711-1-umang.jain@ideasonboard.com>\n\t<20210519101954.77711-4-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210519101954.77711-4-umang.jain@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 3/7] ipa: ipc: Rename\n\tCameraSensorInfo to IPACameraSensorInfo","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","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":17075,"web_url":"https://patchwork.libcamera.org/comment/17075/","msgid":"","date":"2021-05-21T09:35:28","subject":"Re: [libcamera-devel] [PATCH v2 3/7] ipa: ipc: Rename\n\tCameraSensorInfo to IPACameraSensorInfo","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"On Fri, May 21, 2021 at 11:33:05AM +0200, Jacopo Mondi wrote:\n> On Wed, May 19, 2021 at 03:49:50PM +0530, Umang Jain wrote:\n> > This matches the naming convention for IPA IPC.\n> \n> I wonder, now that we moved the stuct out of CameraSensor, would\n> IPASensorInfo be a better fit ?\n\nI'd ba careful about using \"sensor\" only, as we may end up interfacing\nwith other types of sensors in the future. It's possibly a bit unlikely\n(gyroscopes and accelerometers would most likely be handled outside of\nlibcamera), but I'd prefer not ruling it out completely.\n\n> > Signed-off-by: Umang Jain \n> > ---\n> > Documentation/guides/ipa.rst | 8 ++--\n> > include/libcamera/internal/camera_sensor.h | 2 +-\n> > include/libcamera/ipa/core.mojom | 2 +-\n> > include/libcamera/ipa/raspberrypi.mojom | 2 +-\n> > include/libcamera/ipa/rkisp1.mojom | 2 +-\n> > src/ipa/ipu3/ipu3_agc.cpp | 2 +-\n> > src/ipa/raspberrypi/raspberrypi.cpp | 8 ++--\n> > src/ipa/rkisp1/rkisp1.cpp | 6 +--\n> > src/libcamera/camera_sensor.cpp | 6 +--\n> > src/libcamera/ipa/core_ipa_interface.cpp | 38 +++++++++----------\n> > src/libcamera/pipeline/ipu3/ipu3.cpp | 4 +-\n> > .../pipeline/raspberrypi/raspberrypi.cpp | 4 +-\n> > src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n> > 13 files changed, 43 insertions(+), 43 deletions(-)\n> >\n> > diff --git a/Documentation/guides/ipa.rst b/Documentation/guides/ipa.rst\n> > index cbffbd9a..6d460e13 100644\n> > --- a/Documentation/guides/ipa.rst\n> > +++ b/Documentation/guides/ipa.rst\n> > @@ -74,7 +74,7 @@ serialization, any custom data containers must be defined with the mojo IDL.\n> > The following list of libcamera objects are supported in the interface\n> > definition, and may be used as function parameter types or struct field types:\n> >\n> > -- libcamera.CameraSensorInfo\n> > +- libcamera.IPACameraSensorInfo\n> > - libcamera.ControlInfoMap\n> > - libcamera.ControlList\n> > - libcamera.FileDescriptor\n> > @@ -208,7 +208,7 @@ The following is an example of a main interface definition:\n> > start() => (int32 ret);\n> > stop();\n> >\n> > - configure(libcamera.CameraSensorInfo sensorInfo,\n> > + configure(libcamera.IPACameraSensorInfo sensorInfo,\n> > map streamConfig,\n> > map entityControls,\n> > ConfigInput ipaConfig)\n> > @@ -470,7 +470,7 @@ definition:\n> >\n> > .. code-block:: none\n> >\n> > - configure(libcamera.CameraSensorInfo sensorInfo,\n> > + configure(libcamera.IPACameraSensorInfo sensorInfo,\n> > uint32 exampleNumber,\n> > map streamConfig,\n> > map entityControls,\n> > @@ -481,7 +481,7 @@ We will need to implement a function with the following function signature:\n> >\n> > .. code-block:: C++\n> >\n> > - int configure(const CameraSensorInfo &sensorInfo,\n> > + int configure(const IPACameraSensorInfo &sensorInfo,\n> > uint32_t exampleNumber,\n> > const std::map &streamConfig,\n> > const std::map &entityControls,\n> > diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\n> > index 0905ebfa..cf6c1c1e 100644\n> > --- a/include/libcamera/internal/camera_sensor.h\n> > +++ b/include/libcamera/internal/camera_sensor.h\n> > @@ -51,7 +51,7 @@ public:\n> > \tV4L2Subdevice *device() { return subdev_.get(); }\n> >\n> > \tconst ControlList &properties() const { return properties_; }\n> > -\tint sensorInfo(CameraSensorInfo *info) const;\n> > +\tint sensorInfo(IPACameraSensorInfo *info) const;\n> >\n> > \tvoid updateControlInfo();\n> >\n> > diff --git a/include/libcamera/ipa/core.mojom b/include/libcamera/ipa/core.mojom\n> > index b95b3dc4..34a799c2 100644\n> > --- a/include/libcamera/ipa/core.mojom\n> > +++ b/include/libcamera/ipa/core.mojom\n> > @@ -78,7 +78,7 @@ module libcamera;\n> > \tuint32 height;\n> > };\n> >\n> > -struct CameraSensorInfo {\n> > +struct IPACameraSensorInfo {\n> > \tstring model;\n> >\n> > \tuint32 bitsPerPixel;\n> > diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom\n> > index 42321bee..0a21f453 100644\n> > --- a/include/libcamera/ipa/raspberrypi.mojom\n> > +++ b/include/libcamera/ipa/raspberrypi.mojom\n> > @@ -63,7 +63,7 @@ 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(libcamera.CameraSensorInfo sensorInfo,\n> > +\tconfigure(libcamera.IPACameraSensorInfo sensorInfo,\n> > \t\t map streamConfig,\n> > \t\t map entityControls,\n> > \t\t IPAConfig ipaConfig)\n> > diff --git a/include/libcamera/ipa/rkisp1.mojom b/include/libcamera/ipa/rkisp1.mojom\n> > index cca871a0..66a4607c 100644\n> > --- a/include/libcamera/ipa/rkisp1.mojom\n> > +++ b/include/libcamera/ipa/rkisp1.mojom\n> > @@ -29,7 +29,7 @@ interface IPARkISP1Interface {\n> > \tstart() => (int32 ret);\n> > \tstop();\n> >\n> > -\tconfigure(libcamera.CameraSensorInfo sensorInfo,\n> > +\tconfigure(libcamera.IPACameraSensorInfo sensorInfo,\n> > \t\t map streamConfig,\n> > \t\t map entityControls)\n> > \t\t=> (int32 ret);\n> > diff --git a/src/ipa/ipu3/ipu3_agc.cpp b/src/ipa/ipu3/ipu3_agc.cpp\n> > index ca54d89a..8bae423f 100644\n> > --- a/src/ipa/ipu3/ipu3_agc.cpp\n> > +++ b/src/ipa/ipu3/ipu3_agc.cpp\n> > @@ -39,7 +39,7 @@ static constexpr uint32_t kMaxGain = kMaxISO / 100;\n> > static constexpr uint32_t kMinExposure = 1;\n> > static constexpr uint32_t kMaxExposure = 1976;\n> >\n> > -/* \\todo those should be get from CameraSensorInfo ! */\n> > +/* \\todo those should be got from IPACameraSensorInfo ! */\n> > /* line duration in microseconds */\n> > static constexpr double kLineDuration = 16.8;\n> > static constexpr double kMaxExposureTime = kMaxExposure * kLineDuration;\n> > diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\n> > index 87774500..e5bb8159 100644\n> > --- a/src/ipa/raspberrypi/raspberrypi.cpp\n> > +++ b/src/ipa/raspberrypi/raspberrypi.cpp\n> > @@ -89,7 +89,7 @@ public:\n> > \tvoid start(const ControlList &controls, ipa::RPi::StartConfig *startConfig) override;\n> > \tvoid stop() override {}\n> >\n> > -\tint configure(const CameraSensorInfo &sensorInfo,\n> > +\tint configure(const IPACameraSensorInfo &sensorInfo,\n> > \t\t const std::map &streamConfig,\n> > \t\t const std::map &entityControls,\n> > \t\t const ipa::RPi::IPAConfig &data,\n> > @@ -101,7 +101,7 @@ public:\n> > \tvoid signalIspPrepare(const ipa::RPi::ISPConfig &data) override;\n> >\n> > private:\n> > -\tvoid setMode(const CameraSensorInfo &sensorInfo);\n> > +\tvoid setMode(const IPACameraSensorInfo &sensorInfo);\n> > \tbool validateSensorControls();\n> > \tbool validateIspControls();\n> > \tvoid queueRequest(const ControlList &controls);\n> > @@ -278,7 +278,7 @@ void IPARPi::start(const ControlList &controls, ipa::RPi::StartConfig *startConf\n> > \tlastRunTimestamp_ = 0;\n> > }\n> >\n> > -void IPARPi::setMode(const CameraSensorInfo &sensorInfo)\n> > +void IPARPi::setMode(const IPACameraSensorInfo &sensorInfo)\n> > {\n> > \tmode_.bitdepth = sensorInfo.bitsPerPixel;\n> > \tmode_.width = sensorInfo.outputSize.width;\n> > @@ -323,7 +323,7 @@ void IPARPi::setMode(const CameraSensorInfo &sensorInfo)\n> > \tmode_.max_frame_length = sensorInfo.maxFrameLength;\n> > }\n> >\n> > -int IPARPi::configure(const CameraSensorInfo &sensorInfo,\n> > +int IPARPi::configure(const IPACameraSensorInfo &sensorInfo,\n> > \t\t [[maybe_unused]] const std::map &streamConfig,\n> > \t\t const std::map &entityControls,\n> > \t\t const ipa::RPi::IPAConfig &ipaConfig,\n> > diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> > index 6d45673c..b47ea324 100644\n> > --- a/src/ipa/rkisp1/rkisp1.cpp\n> > +++ b/src/ipa/rkisp1/rkisp1.cpp\n> > @@ -37,7 +37,7 @@ public:\n> > \tint start() override;\n> > \tvoid stop() override {}\n> >\n> > -\tint configure(const CameraSensorInfo &info,\n> > +\tint configure(const IPACameraSensorInfo &info,\n> > \t\t const std::map &streamConfig,\n> > \t\t const std::map &entityControls) override;\n> > \tvoid mapBuffers(const std::vector &buffers) override;\n> > @@ -90,12 +90,12 @@ int IPARkISP1::start()\n> > }\n> >\n> > /**\n> > - * \\todo The RkISP1 pipeline currently provides an empty CameraSensorInfo\n> > + * \\todo The RkISP1 pipeline currently provides an empty IPACameraSensorInfo\n> > * if the connected sensor does not provide enough information to properly\n> > * assemble one. Make sure the reported sensor information are relevant\n> > * before accessing them.\n> > */\n> > -int IPARkISP1::configure([[maybe_unused]] const CameraSensorInfo &info,\n> > +int IPARkISP1::configure([[maybe_unused]] const IPACameraSensorInfo &info,\n> > \t\t\t [[maybe_unused]] const std::map &streamConfig,\n> > \t\t\t const std::map &entityControls)\n> > {\n> > diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\n> > index 170de827..0fb8a258 100644\n> > --- a/src/libcamera/camera_sensor.cpp\n> > +++ b/src/libcamera/camera_sensor.cpp\n> > @@ -205,7 +205,7 @@ int CameraSensor::validateSensorDriver()\n> > \t *\n> > \t * Failures in reading any of the targets are not deemed to be fatal,\n> > \t * but some properties and features, like constructing a\n> > -\t * CameraSensorInfo for the IPA module, won't be supported.\n> > +\t * IPACameraSensorInfo for the IPA module, won't be supported.\n> > \t *\n> > \t * \\todo Make support for selection targets mandatory as soon as all\n> > \t * test platforms have been updated.\n> > @@ -674,7 +674,7 @@ int CameraSensor::setControls(ControlList *ctrls)\n> > *\n> > * \\return 0 on success, a negative error code otherwise\n> > */\n> > -int CameraSensor::sensorInfo(CameraSensorInfo *info) const\n> > +int CameraSensor::sensorInfo(IPACameraSensorInfo *info) const\n> > {\n> > \tif (!bayerFormat_)\n> > \t\treturn -EINVAL;\n> > @@ -701,7 +701,7 @@ int CameraSensor::sensorInfo(CameraSensorInfo *info) const\n> > \t}\n> >\n> > \t/*\n> > -\t * CameraSensorInfo::analogCrop::x and CameraSensorInfo::analogCrop::y\n> > +\t * IPACameraSensorInfo::analogCrop::x and IPACameraSensorInfo::analogCrop::y\n> > \t * are defined relatively to the active pixel area, while V4L2's\n> > \t * TGT_CROP target is defined in respect to the full pixel array.\n> > \t *\n> > diff --git a/src/libcamera/ipa/core_ipa_interface.cpp b/src/libcamera/ipa/core_ipa_interface.cpp\n> > index def8d184..15d61d91 100644\n> > --- a/src/libcamera/ipa/core_ipa_interface.cpp\n> > +++ b/src/libcamera/ipa/core_ipa_interface.cpp\n> > @@ -103,7 +103,7 @@ namespace libcamera {\n> > */\n> >\n> > /**\n> > - * \\struct CameraSensorInfo\n> > + * \\struct IPACameraSensorInfo\n> > * \\brief Report the image sensor characteristics\n> > *\n> > * The structure reports image sensor characteristics used by IPA modules to\n> > @@ -121,15 +121,15 @@ namespace libcamera {\n> > */\n> >\n> > /**\n> > - * \\fn CameraSensorInfo::CameraSensorInfo(const std::string &model,\n> > -\t\t\t\t\t uint32_t bitsPerPixel,\n> > -\t\t\t\t\t const Size &activeAreaSize,\n> > -\t\t\t\t\t const Rectangle &analogCrop,\n> > -\t\t\t\t\t const Size &outputSize,\n> > -\t\t\t\t\t uint64_t pixelRate,\n> > -\t\t\t\t\t uint32_t lineLength,\n> > -\t\t\t\t\t uint32_t minFrameLength,\n> > -\t\t\t\t\t uint32_t maxFrameLength)\n> > + * \\fn IPACameraSensorInfo::IPACameraSensorInfo(const std::string &model,\n> > +\t\t\t\t\t\tuint32_t bitsPerPixel,\n> > +\t\t\t\t\t\tconst Size &activeAreaSize,\n> > +\t\t\t\t\t\tconst Rectangle &analogCrop,\n> > +\t\t\t\t\t\tconst Size &outputSize,\n> > +\t\t\t\t\t\tuint64_t pixelRate,\n> > +\t\t\t\t\t\tuint32_t lineLength,\n> > +\t\t\t\t\t\tuint32_t minFrameLength,\n> > +\t\t\t\t\t\tuint32_t maxFrameLength)\n> > * \\param[in] model\n> > * \\param[in] bitsPerPixel\n> > * \\param[in] activeAreaSize\n> > @@ -142,7 +142,7 @@ namespace libcamera {\n> > */\n> >\n> > /**\n> > - * \\var CameraSensorInfo::model\n> > + * \\var IPACameraSensorInfo::model\n> > * \\brief The image sensor model name\n> > *\n> > * The sensor model name is a free-formed string that uniquely identifies the\n> > @@ -150,18 +150,18 @@ namespace libcamera {\n> > */\n> >\n> > /**\n> > - * \\var CameraSensorInfo::bitsPerPixel\n> > + * \\var IPACameraSensorInfo::bitsPerPixel\n> > * \\brief The number of bits per pixel of the image format produced by the\n> > * image sensor\n> > */\n> >\n> > /**\n> > - * \\var CameraSensorInfo::activeAreaSize\n> > + * \\var IPACameraSensorInfo::activeAreaSize\n> > * \\brief The size of the pixel array active area of the sensor\n> > */\n> >\n> > /**\n> > - * \\var CameraSensorInfo::analogCrop\n> > + * \\var IPACameraSensorInfo::analogCrop\n> > * \\brief The portion of the pixel array active area which is read-out and\n> > * processed\n> > *\n> > @@ -174,7 +174,7 @@ namespace libcamera {\n> > */\n> >\n> > /**\n> > - * \\var CameraSensorInfo::outputSize\n> > + * \\var IPACameraSensorInfo::outputSize\n> > * \\brief The size of the images produced by the camera sensor\n> > *\n> > * The output image size defines the horizontal and vertical sizes of the images\n> > @@ -187,7 +187,7 @@ namespace libcamera {\n> > */\n> >\n> > /**\n> > - * \\var CameraSensorInfo::pixelRate\n> > + * \\var IPACameraSensorInfo::pixelRate\n> > * \\brief The number of pixels produced in a second\n> > *\n> > * To obtain the read-out time in seconds of a full line:\n> > @@ -198,14 +198,14 @@ namespace libcamera {\n> > */\n> >\n> > /**\n> > - * \\var CameraSensorInfo::lineLength\n> > + * \\var IPACameraSensorInfo::lineLength\n> > * \\brief Total line length in pixels\n> > *\n> > * The total line length in pixel clock periods, including blanking.\n> > */\n> >\n> > /**\n> > - * \\var CameraSensorInfo::minFrameLength\n> > + * \\var IPACameraSensorInfo::minFrameLength\n> > * \\brief The minimum allowable frame length in units of lines\n> > *\n> > * The sensor frame length comprises of active output lines and blanking lines\n> > @@ -220,7 +220,7 @@ namespace libcamera {\n> > */\n> >\n> > /**\n> > - * \\var CameraSensorInfo::maxFrameLength\n> > + * \\var IPACameraSensorInfo::maxFrameLength\n> > * \\brief The maximum allowable frame length in units of lines\n> > *\n> > * The sensor frame length comprises of active output lines and blanking lines\n> > diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> > index ade8ffbd..98c6160f 100644\n> > --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> > +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> > @@ -544,7 +544,7 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n> > \tif (ret)\n> > \t\treturn ret;\n> >\n> > -\tCameraSensorInfo sensorInfo;\n> > +\tIPACameraSensorInfo sensorInfo;\n> > \tcio2->sensor()->sensorInfo(&sensorInfo);\n> > \tdata->cropRegion_ = sensorInfo.analogCrop;\n> >\n> > @@ -883,7 +883,7 @@ int PipelineHandlerIPU3::initControls(IPU3CameraData *data)\n> > \tif (ret)\n> > \t\treturn ret;\n> >\n> > -\tCameraSensorInfo sensorInfo{};\n> > +\tIPACameraSensorInfo sensorInfo{};\n> > \tret = sensor->sensorInfo(&sensorInfo);\n> > \tif (ret)\n> > \t\treturn ret;\n> > diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> > index 6fbdba04..f2a94dc0 100644\n> > --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> > +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> > @@ -211,7 +211,7 @@ public:\n> > \tBayerFormat::Order nativeBayerOrder_;\n> >\n> > \t/* For handling digital zoom. */\n> > -\tCameraSensorInfo sensorInfo_;\n> > +\tIPACameraSensorInfo sensorInfo_;\n> > \tRectangle ispCrop_; /* crop in ISP (camera mode) pixels */\n> > \tRectangle scalerCrop_; /* crop in sensor native pixels */\n> > \tbool updateScalerCrop_;\n> > @@ -1275,7 +1275,7 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)\n> > \t\tipaConfig.lsTableHandle = lsTable_;\n> > \t}\n> >\n> > -\t/* We store the CameraSensorInfo for digital zoom calculations. */\n> > +\t/* We store the IPACameraSensorInfo for digital zoom calculations. */\n> > \tint ret = sensor_->sensorInfo(&sensorInfo_);\n> > \tif (ret) {\n> > \t\tLOG(RPI, Error) << \"Failed to retrieve camera sensor info\";\n> > diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > index adebe8b5..6699839c 100644\n> > --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > @@ -648,7 +648,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n> > \t\treturn ret;\n> >\n> > \t/* Inform IPA of stream configuration and sensor controls. */\n> > -\tCameraSensorInfo sensorInfo = {};\n> > +\tIPACameraSensorInfo sensorInfo = {};\n> > \tret = data->sensor_->sensorInfo(&sensorInfo);\n> > \tif (ret) {\n> > \t\t/* \\todo Turn this into a hard failure. */","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 BE925C31FF\n\tfor ;\n\tFri, 21 May 2021 09:35:33 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2A7D26891F;\n\tFri, 21 May 2021 11:35:33 +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 9E58A68918\n\tfor ;\n\tFri, 21 May 2021 11:35:31 +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 028C68D8;\n\tFri, 21 May 2021 11:35: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=\"smI1B4hg\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1621589731;\n\tbh=RhWUuzaBJeGZ6BdR4Lryf2hqZLR5fw1pe1lotcoDBpk=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=smI1B4hg9b/vboAjUjMFITFli9LG5kZlF/vxrFlTJ7SUvv23ggkEQ0+dhW5KsxwzO\n\trcxetP88FGDzA0lnKEwTK/uD2Ny+q4GMvXKj7w6bhu9t+s8HPIM1QK3DRGqfpie1w/\n\tJX2XgNoFV3YVWJuM4Ci6bjlUZvI9bPp6hQVX6/VE=","Date":"Fri, 21 May 2021 12:35:28 +0300","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Message-ID":"","References":"<20210519101954.77711-1-umang.jain@ideasonboard.com>\n\t<20210519101954.77711-4-umang.jain@ideasonboard.com>\n\t<20210521093305.gfluc7ax566phdg4@uno.localdomain>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210521093305.gfluc7ax566phdg4@uno.localdomain>","Subject":"Re: [libcamera-devel] [PATCH v2 3/7] ipa: ipc: Rename\n\tCameraSensorInfo to IPACameraSensorInfo","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","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]