[{"id":14062,"web_url":"https://patchwork.libcamera.org/comment/14062/","msgid":"<20201204161639.uplz3ph6w6k7pdge@uno.localdomain>","date":"2020-12-04T16:16:39","subject":"Re: [libcamera-devel] [PATCH v3 2/3] libcamera: ipa: Pass a set of\n\tcontrols and return results from ipa::start()","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Naush,\n\nOn Fri, Dec 04, 2020 at 03:31:20PM +0000, Naushir Patuck wrote:\n> This change allows controls passed into PipelineHandler::start to be\n> forwarded onto IPAInterface::start(). We also add a return channel if the\n> pipeline handler must action any of these controls, e.g. setting the\n> analogue gain or shutter speed in the sensor device.\n>\n> todo: The IPA interface wrapper needs a translation for passing\n> IPAOperationData into start() and configure()\n>\n> Signed-off-by: Naushir Patuck <naush@raspberrypi.com>\n> Reviewed-by: David Plowman <david.plowman@raspberrypi.com>\n> Tested-by: David Plowman <david.plowman@raspberrypi.com>\n\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n\nThanks\n  j\n\n> ---\n>  include/libcamera/internal/ipa_context_wrapper.h   |  3 ++-\n>  include/libcamera/ipa/ipa_interface.h              |  3 ++-\n>  src/ipa/libipa/ipa_interface_wrapper.cpp           |  4 +++-\n>  src/ipa/raspberrypi/raspberrypi.cpp                |  5 +++--\n>  src/ipa/rkisp1/rkisp1.cpp                          |  3 ++-\n>  src/ipa/vimc/vimc.cpp                              |  6 ++++--\n>  src/libcamera/ipa_context_wrapper.cpp              |  5 +++--\n>  src/libcamera/ipa_interface.cpp                    |  7 +++++++\n>  src/libcamera/pipeline/raspberrypi/raspberrypi.cpp |  7 +++++--\n>  src/libcamera/pipeline/rkisp1/rkisp1.cpp           |  3 ++-\n>  src/libcamera/pipeline/vimc/vimc.cpp               |  3 ++-\n>  src/libcamera/proxy/ipa_proxy_linux.cpp            |  3 ++-\n>  src/libcamera/proxy/ipa_proxy_thread.cpp           | 13 ++++++++-----\n>  test/ipa/ipa_interface_test.cpp                    |  3 ++-\n>  test/ipa/ipa_wrappers_test.cpp                     |  5 +++--\n>  15 files changed, 50 insertions(+), 23 deletions(-)\n>\n> diff --git a/include/libcamera/internal/ipa_context_wrapper.h b/include/libcamera/internal/ipa_context_wrapper.h\n> index 8f767e84..ec27e48e 100644\n> --- a/include/libcamera/internal/ipa_context_wrapper.h\n> +++ b/include/libcamera/internal/ipa_context_wrapper.h\n> @@ -20,7 +20,8 @@ public:\n>  \t~IPAContextWrapper();\n>\n>  \tint init(const IPASettings &settings) override;\n> -\tint start() override;\n> +\tint start(const IPAOperationData &data,\n> +\t\t  IPAOperationData *result) override;\n>  \tvoid stop() override;\n>  \tvoid configure(const CameraSensorInfo &sensorInfo,\n>  \t\t       const std::map<unsigned int, IPAStream> &streamConfig,\n> diff --git a/include/libcamera/ipa/ipa_interface.h b/include/libcamera/ipa/ipa_interface.h\n> index 322b7079..df12f9ce 100644\n> --- a/include/libcamera/ipa/ipa_interface.h\n> +++ b/include/libcamera/ipa/ipa_interface.h\n> @@ -153,7 +153,8 @@ public:\n>  \tvirtual ~IPAInterface() = default;\n>\n>  \tvirtual int init(const IPASettings &settings) = 0;\n> -\tvirtual int start() = 0;\n> +\tvirtual int start(const IPAOperationData &data,\n> +\t\t\t  IPAOperationData *result) = 0;\n>  \tvirtual void stop() = 0;\n>\n>  \tvirtual void configure(const CameraSensorInfo &sensorInfo,\n> diff --git a/src/ipa/libipa/ipa_interface_wrapper.cpp b/src/ipa/libipa/ipa_interface_wrapper.cpp\n> index cee532e3..40628489 100644\n> --- a/src/ipa/libipa/ipa_interface_wrapper.cpp\n> +++ b/src/ipa/libipa/ipa_interface_wrapper.cpp\n> @@ -95,7 +95,9 @@ int IPAInterfaceWrapper::start(struct ipa_context *_ctx)\n>  {\n>  \tIPAInterfaceWrapper *ctx = static_cast<IPAInterfaceWrapper *>(_ctx);\n>\n> -\treturn ctx->ipa_->start();\n> +\t/* \\todo Translate the data and result. */\n> +\tIPAOperationData data = {};\n> +\treturn ctx->ipa_->start(data, nullptr);\n>  }\n>\n>  void IPAInterfaceWrapper::stop(struct ipa_context *_ctx)\n> diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\n> index 29d48b1b..b8c0f955 100644\n> --- a/src/ipa/raspberrypi/raspberrypi.cpp\n> +++ b/src/ipa/raspberrypi/raspberrypi.cpp\n> @@ -78,13 +78,14 @@ public:\n>  \t}\n>\n>  \tint init(const IPASettings &settings) override;\n> -\tint start() override { return 0; }\n> +\tint start([[maybe_unused]] const IPAOperationData &data,\n> +\t\t  [[maybe_unused]] IPAOperationData *result) override { return 0; }\n>  \tvoid stop() override {}\n>\n>  \tvoid configure(const CameraSensorInfo &sensorInfo,\n>  \t\t       const std::map<unsigned int, IPAStream> &streamConfig,\n>  \t\t       const std::map<unsigned int, const ControlInfoMap &> &entityControls,\n> -\t\t       const IPAOperationData &data,\n> +\t\t       const IPAOperationData &ipaConfig,\n>  \t\t       IPAOperationData *response) override;\n>  \tvoid mapBuffers(const std::vector<IPABuffer> &buffers) override;\n>  \tvoid unmapBuffers(const std::vector<unsigned int> &ids) override;\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index 07d7f1b2..39783abd 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -37,7 +37,8 @@ public:\n>  \t{\n>  \t\treturn 0;\n>  \t}\n> -\tint start() override { return 0; }\n> +\tint start([[maybe_unused]] const IPAOperationData &data,\n> +\t\t  [[maybe_unused]] IPAOperationData *result) override { return 0; }\n>  \tvoid stop() override {}\n>\n>  \tvoid configure(const CameraSensorInfo &info,\n> diff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp\n> index cf841135..074902ee 100644\n> --- a/src/ipa/vimc/vimc.cpp\n> +++ b/src/ipa/vimc/vimc.cpp\n> @@ -34,7 +34,8 @@ public:\n>\n>  \tint init(const IPASettings &settings) override;\n>\n> -\tint start() override;\n> +\tint start(const IPAOperationData &data,\n> +\t\t  IPAOperationData *result) override;\n>  \tvoid stop() override;\n>\n>  \tvoid configure([[maybe_unused]] const CameraSensorInfo &sensorInfo,\n> @@ -82,7 +83,8 @@ int IPAVimc::init(const IPASettings &settings)\n>  \treturn 0;\n>  }\n>\n> -int IPAVimc::start()\n> +int IPAVimc::start([[maybe_unused]] const IPAOperationData &data,\n> +\t\t   [[maybe_unused]] IPAOperationData *result)\n>  {\n>  \ttrace(IPAOperationStart);\n>\n> diff --git a/src/libcamera/ipa_context_wrapper.cpp b/src/libcamera/ipa_context_wrapper.cpp\n> index 231300ce..19c44ad8 100644\n> --- a/src/libcamera/ipa_context_wrapper.cpp\n> +++ b/src/libcamera/ipa_context_wrapper.cpp\n> @@ -86,10 +86,11 @@ int IPAContextWrapper::init(const IPASettings &settings)\n>  \treturn 0;\n>  }\n>\n> -int IPAContextWrapper::start()\n> +int IPAContextWrapper::start(const IPAOperationData &data,\n> +\t\t\t     IPAOperationData *result)\n>  {\n>  \tif (intf_)\n> -\t\treturn intf_->start();\n> +\t\treturn intf_->start(data, result);\n>\n>  \tif (!ctx_)\n>  \t\treturn 0;\n> diff --git a/src/libcamera/ipa_interface.cpp b/src/libcamera/ipa_interface.cpp\n> index 23fc56d7..5be6f787 100644\n> --- a/src/libcamera/ipa_interface.cpp\n> +++ b/src/libcamera/ipa_interface.cpp\n> @@ -536,10 +536,17 @@ namespace libcamera {\n>  /**\n>   * \\fn IPAInterface::start()\n>   * \\brief Start the IPA\n> + * \\param[in] data Protocol-specific data for the start operation\n> + * \\param[out] result Result of the start operation\n>   *\n>   * This method informs the IPA module that the camera is about to be started.\n>   * The IPA module shall prepare any resources it needs to operate.\n>   *\n> + * The \\a data and \\a result parameters carry custom data passed by the\n> + * pipeline handler to the IPA and back. The pipeline handler may set the \\a\n> + * result parameter to null if the IPA protocol doesn't need to pass a result\n> + * back through the start() function.\n> + *\n>   * \\return 0 on success or a negative error code otherwise\n>   */\n>\n> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> index 9937db73..bafd0b2d 100644\n> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> @@ -752,7 +752,10 @@ int PipelineHandlerRPi::start(Camera *camera, [[maybe_unused]] ControlList *cont\n>  \t}\n>\n>  \t/* Start the IPA. */\n> -\tret = data->ipa_->start();\n> +\tIPAOperationData ipaData = {}, result = {};\n> +\tif (controls)\n> +\t\tipaData.controls.emplace_back(*controls);\n> +\tret = data->ipa_->start(ipaData, &result);\n>  \tif (ret) {\n>  \t\tLOG(RPI, Error)\n>  \t\t\t<< \"Failed to start IPA for \" << camera->id();\n> @@ -1189,7 +1192,7 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)\n>  \t}\n>\n>  \t/* Ready the IPA - it must know about the sensor resolution. */\n> -\tIPAOperationData result;\n> +\tIPAOperationData result = {};\n>\n>  \tipa_->configure(sensorInfo_, streamConfig, entityControls, ipaConfig,\n>  \t\t\t&result);\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 4e959fde..eaa10f9f 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -842,7 +842,8 @@ int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] ControlList *c\n>  \tif (ret)\n>  \t\treturn ret;\n>\n> -\tret = data->ipa_->start();\n> +\tIPAOperationData ipaData = {};\n> +\tret = data->ipa_->start(ipaData, nullptr);\n>  \tif (ret) {\n>  \t\tfreeBuffers(camera);\n>  \t\tLOG(RkISP1, Error)\n> diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\n> index d81b8598..2a5054a8 100644\n> --- a/src/libcamera/pipeline/vimc/vimc.cpp\n> +++ b/src/libcamera/pipeline/vimc/vimc.cpp\n> @@ -322,7 +322,8 @@ int PipelineHandlerVimc::start(Camera *camera, [[maybe_unused]] ControlList *con\n>  \tif (ret < 0)\n>  \t\treturn ret;\n>\n> -\tret = data->ipa_->start();\n> +\tIPAOperationData ipaData = {};\n> +\tret = data->ipa_->start(ipaData, nullptr);\n>  \tif (ret) {\n>  \t\tdata->video_->releaseBuffers();\n>  \t\treturn ret;\n> diff --git a/src/libcamera/proxy/ipa_proxy_linux.cpp b/src/libcamera/proxy/ipa_proxy_linux.cpp\n> index b78a0e45..ea6f3e5e 100644\n> --- a/src/libcamera/proxy/ipa_proxy_linux.cpp\n> +++ b/src/libcamera/proxy/ipa_proxy_linux.cpp\n> @@ -30,7 +30,8 @@ public:\n>  \t{\n>  \t\treturn 0;\n>  \t}\n> -\tint start() override { return 0; }\n> +\tint start([[maybe_unused]] const IPAOperationData &data,\n> +\t\t  [[maybe_unused]] IPAOperationData *result) override { return 0; }\n>  \tvoid stop() override {}\n>  \tvoid configure([[maybe_unused]] const CameraSensorInfo &sensorInfo,\n>  \t\t       [[maybe_unused]] const std::map<unsigned int, IPAStream> &streamConfig,\n> diff --git a/src/libcamera/proxy/ipa_proxy_thread.cpp b/src/libcamera/proxy/ipa_proxy_thread.cpp\n> index eead2883..a5fda2c8 100644\n> --- a/src/libcamera/proxy/ipa_proxy_thread.cpp\n> +++ b/src/libcamera/proxy/ipa_proxy_thread.cpp\n> @@ -26,7 +26,8 @@ public:\n>  \tIPAProxyThread(IPAModule *ipam);\n>\n>  \tint init(const IPASettings &settings) override;\n> -\tint start() override;\n> +\tint start(const IPAOperationData &data,\n> +\t\t  IPAOperationData *result) override;\n>  \tvoid stop() override;\n>\n>  \tvoid configure(const CameraSensorInfo &sensorInfo,\n> @@ -50,9 +51,9 @@ private:\n>  \t\t\tipa_ = ipa;\n>  \t\t}\n>\n> -\t\tint start()\n> +\t\tint start(const IPAOperationData &data, IPAOperationData *result)\n>  \t\t{\n> -\t\t\treturn ipa_->start();\n> +\t\t\treturn ipa_->start(data, result);\n>  \t\t}\n>\n>  \t\tvoid stop()\n> @@ -111,12 +112,14 @@ int IPAProxyThread::init(const IPASettings &settings)\n>  \treturn 0;\n>  }\n>\n> -int IPAProxyThread::start()\n> +int IPAProxyThread::start(const IPAOperationData &data,\n> +\t\t\t  IPAOperationData *result)\n>  {\n>  \trunning_ = true;\n>  \tthread_.start();\n>\n> -\treturn proxy_.invokeMethod(&ThreadProxy::start, ConnectionTypeBlocking);\n> +\treturn proxy_.invokeMethod(&ThreadProxy::start, ConnectionTypeBlocking,\n> +\t\t\t\t   data, result);\n>  }\n>\n>  void IPAProxyThread::stop()\n> diff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp\n> index 9f575f93..dbb6727f 100644\n> --- a/test/ipa/ipa_interface_test.cpp\n> +++ b/test/ipa/ipa_interface_test.cpp\n> @@ -120,7 +120,8 @@ protected:\n>  \t\t}\n>\n>  \t\t/* Test start of IPA module. */\n> -\t\tipa_->start();\n> +\t\tIPAOperationData data = {};\n> +\t\tipa_->start(data, nullptr);\n>  \t\ttimer.start(1000);\n>  \t\twhile (timer.isRunning() && trace_ != IPAOperationStart)\n>  \t\t\tdispatcher->processEvents();\n> diff --git a/test/ipa/ipa_wrappers_test.cpp b/test/ipa/ipa_wrappers_test.cpp\n> index 59d991cb..47533d10 100644\n> --- a/test/ipa/ipa_wrappers_test.cpp\n> +++ b/test/ipa/ipa_wrappers_test.cpp\n> @@ -56,7 +56,8 @@ public:\n>  \t\treturn 0;\n>  \t}\n>\n> -\tint start() override\n> +\tint start([[maybe_unused]] const IPAOperationData &data,\n> +\t\t  [[maybe_unused]] IPAOperationData *result) override\n>  \t{\n>  \t\treport(Op_start, TestPass);\n>  \t\treturn 0;\n> @@ -376,7 +377,7 @@ protected:\n>  \t\t\treturn TestFail;\n>  \t\t}\n>\n> -\t\tret = INVOKE(start);\n> +\t\tret = INVOKE(start, ipaConfig, nullptr);\n>  \t\tif (ret == TestFail) {\n>  \t\t\tcerr << \"Failed to run start()\";\n>  \t\t\treturn TestFail;\n> --\n> 2.25.1\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id E3F6ABE177\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri,  4 Dec 2020 16:16:34 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BC007635DE;\n\tFri,  4 Dec 2020 17:16:34 +0100 (CET)","from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net\n\t[217.70.183.194])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 974BC635D0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri,  4 Dec 2020 17:16:33 +0100 (CET)","from uno.localdomain (93-34-118-233.ip49.fastwebnet.it\n\t[93.34.118.233]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 135F54000D;\n\tFri,  4 Dec 2020 16:16:32 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","Date":"Fri, 4 Dec 2020 17:16:39 +0100","From":"Jacopo Mondi <jacopo@jmondi.org>","To":"Naushir Patuck <naush@raspberrypi.com>","Message-ID":"<20201204161639.uplz3ph6w6k7pdge@uno.localdomain>","References":"<20201204153121.66136-1-naush@raspberrypi.com>\n\t<20201204153121.66136-3-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201204153121.66136-3-naush@raspberrypi.com>","Subject":"Re: [libcamera-devel] [PATCH v3 2/3] libcamera: ipa: Pass a set of\n\tcontrols and return results from ipa::start()","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":14084,"web_url":"https://patchwork.libcamera.org/comment/14084/","msgid":"<X8v6MpXQqsLFIVSx@pendragon.ideasonboard.com>","date":"2020-12-05T21:22:58","subject":"Re: [libcamera-devel] [PATCH v3 2/3] libcamera: ipa: Pass a set of\n\tcontrols and return results from ipa::start()","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Naush,\n\nThank you for the patch.\n\nOn Fri, Dec 04, 2020 at 03:31:20PM +0000, Naushir Patuck wrote:\n> This change allows controls passed into PipelineHandler::start to be\n> forwarded onto IPAInterface::start(). We also add a return channel if the\n> pipeline handler must action any of these controls, e.g. setting the\n> analogue gain or shutter speed in the sensor device.\n> \n> todo: The IPA interface wrapper needs a translation for passing\n> IPAOperationData into start() and configure()\n\nI'd replace this with\n\n\"The IPA interface wrapper isn't addressed as it will soon be replaced\nby a new mechanism to handle IPC.\"\n\nas it's not really something we need to do.\n\n> Signed-off-by: Naushir Patuck <naush@raspberrypi.com>\n> Reviewed-by: David Plowman <david.plowman@raspberrypi.com>\n> Tested-by: David Plowman <david.plowman@raspberrypi.com>\n> ---\n>  include/libcamera/internal/ipa_context_wrapper.h   |  3 ++-\n>  include/libcamera/ipa/ipa_interface.h              |  3 ++-\n>  src/ipa/libipa/ipa_interface_wrapper.cpp           |  4 +++-\n>  src/ipa/raspberrypi/raspberrypi.cpp                |  5 +++--\n>  src/ipa/rkisp1/rkisp1.cpp                          |  3 ++-\n>  src/ipa/vimc/vimc.cpp                              |  6 ++++--\n>  src/libcamera/ipa_context_wrapper.cpp              |  5 +++--\n>  src/libcamera/ipa_interface.cpp                    |  7 +++++++\n>  src/libcamera/pipeline/raspberrypi/raspberrypi.cpp |  7 +++++--\n>  src/libcamera/pipeline/rkisp1/rkisp1.cpp           |  3 ++-\n>  src/libcamera/pipeline/vimc/vimc.cpp               |  3 ++-\n>  src/libcamera/proxy/ipa_proxy_linux.cpp            |  3 ++-\n>  src/libcamera/proxy/ipa_proxy_thread.cpp           | 13 ++++++++-----\n>  test/ipa/ipa_interface_test.cpp                    |  3 ++-\n>  test/ipa/ipa_wrappers_test.cpp                     |  5 +++--\n>  15 files changed, 50 insertions(+), 23 deletions(-)\n> \n> diff --git a/include/libcamera/internal/ipa_context_wrapper.h b/include/libcamera/internal/ipa_context_wrapper.h\n> index 8f767e84..ec27e48e 100644\n> --- a/include/libcamera/internal/ipa_context_wrapper.h\n> +++ b/include/libcamera/internal/ipa_context_wrapper.h\n> @@ -20,7 +20,8 @@ public:\n>  \t~IPAContextWrapper();\n>  \n>  \tint init(const IPASettings &settings) override;\n> -\tint start() override;\n> +\tint start(const IPAOperationData &data,\n> +\t\t  IPAOperationData *result) override;\n>  \tvoid stop() override;\n>  \tvoid configure(const CameraSensorInfo &sensorInfo,\n>  \t\t       const std::map<unsigned int, IPAStream> &streamConfig,\n> diff --git a/include/libcamera/ipa/ipa_interface.h b/include/libcamera/ipa/ipa_interface.h\n> index 322b7079..df12f9ce 100644\n> --- a/include/libcamera/ipa/ipa_interface.h\n> +++ b/include/libcamera/ipa/ipa_interface.h\n> @@ -153,7 +153,8 @@ public:\n>  \tvirtual ~IPAInterface() = default;\n>  \n>  \tvirtual int init(const IPASettings &settings) = 0;\n> -\tvirtual int start() = 0;\n> +\tvirtual int start(const IPAOperationData &data,\n> +\t\t\t  IPAOperationData *result) = 0;\n>  \tvirtual void stop() = 0;\n>  \n>  \tvirtual void configure(const CameraSensorInfo &sensorInfo,\n> diff --git a/src/ipa/libipa/ipa_interface_wrapper.cpp b/src/ipa/libipa/ipa_interface_wrapper.cpp\n> index cee532e3..40628489 100644\n> --- a/src/ipa/libipa/ipa_interface_wrapper.cpp\n> +++ b/src/ipa/libipa/ipa_interface_wrapper.cpp\n> @@ -95,7 +95,9 @@ int IPAInterfaceWrapper::start(struct ipa_context *_ctx)\n>  {\n>  \tIPAInterfaceWrapper *ctx = static_cast<IPAInterfaceWrapper *>(_ctx);\n>  \n> -\treturn ctx->ipa_->start();\n> +\t/* \\todo Translate the data and result. */\n> +\tIPAOperationData data = {};\n> +\treturn ctx->ipa_->start(data, nullptr);\n>  }\n>  \n>  void IPAInterfaceWrapper::stop(struct ipa_context *_ctx)\n> diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\n> index 29d48b1b..b8c0f955 100644\n> --- a/src/ipa/raspberrypi/raspberrypi.cpp\n> +++ b/src/ipa/raspberrypi/raspberrypi.cpp\n> @@ -78,13 +78,14 @@ public:\n>  \t}\n>  \n>  \tint init(const IPASettings &settings) override;\n> -\tint start() override { return 0; }\n> +\tint start([[maybe_unused]] const IPAOperationData &data,\n> +\t\t  [[maybe_unused]] IPAOperationData *result) override { return 0; }\n>  \tvoid stop() override {}\n>  \n>  \tvoid configure(const CameraSensorInfo &sensorInfo,\n>  \t\t       const std::map<unsigned int, IPAStream> &streamConfig,\n>  \t\t       const std::map<unsigned int, const ControlInfoMap &> &entityControls,\n> -\t\t       const IPAOperationData &data,\n> +\t\t       const IPAOperationData &ipaConfig,\n>  \t\t       IPAOperationData *response) override;\n>  \tvoid mapBuffers(const std::vector<IPABuffer> &buffers) override;\n>  \tvoid unmapBuffers(const std::vector<unsigned int> &ids) override;\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index 07d7f1b2..39783abd 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -37,7 +37,8 @@ public:\n>  \t{\n>  \t\treturn 0;\n>  \t}\n> -\tint start() override { return 0; }\n> +\tint start([[maybe_unused]] const IPAOperationData &data,\n> +\t\t  [[maybe_unused]] IPAOperationData *result) override { return 0; }\n>  \tvoid stop() override {}\n>  \n>  \tvoid configure(const CameraSensorInfo &info,\n> diff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp\n> index cf841135..074902ee 100644\n> --- a/src/ipa/vimc/vimc.cpp\n> +++ b/src/ipa/vimc/vimc.cpp\n> @@ -34,7 +34,8 @@ public:\n>  \n>  \tint init(const IPASettings &settings) override;\n>  \n> -\tint start() override;\n> +\tint start(const IPAOperationData &data,\n> +\t\t  IPAOperationData *result) override;\n>  \tvoid stop() override;\n>  \n>  \tvoid configure([[maybe_unused]] const CameraSensorInfo &sensorInfo,\n> @@ -82,7 +83,8 @@ int IPAVimc::init(const IPASettings &settings)\n>  \treturn 0;\n>  }\n>  \n> -int IPAVimc::start()\n> +int IPAVimc::start([[maybe_unused]] const IPAOperationData &data,\n> +\t\t   [[maybe_unused]] IPAOperationData *result)\n>  {\n>  \ttrace(IPAOperationStart);\n>  \n> diff --git a/src/libcamera/ipa_context_wrapper.cpp b/src/libcamera/ipa_context_wrapper.cpp\n> index 231300ce..19c44ad8 100644\n> --- a/src/libcamera/ipa_context_wrapper.cpp\n> +++ b/src/libcamera/ipa_context_wrapper.cpp\n> @@ -86,10 +86,11 @@ int IPAContextWrapper::init(const IPASettings &settings)\n>  \treturn 0;\n>  }\n>  \n> -int IPAContextWrapper::start()\n> +int IPAContextWrapper::start(const IPAOperationData &data,\n> +\t\t\t     IPAOperationData *result)\n>  {\n>  \tif (intf_)\n> -\t\treturn intf_->start();\n> +\t\treturn intf_->start(data, result);\n>  \n>  \tif (!ctx_)\n>  \t\treturn 0;\n> diff --git a/src/libcamera/ipa_interface.cpp b/src/libcamera/ipa_interface.cpp\n> index 23fc56d7..5be6f787 100644\n> --- a/src/libcamera/ipa_interface.cpp\n> +++ b/src/libcamera/ipa_interface.cpp\n> @@ -536,10 +536,17 @@ namespace libcamera {\n>  /**\n>   * \\fn IPAInterface::start()\n>   * \\brief Start the IPA\n> + * \\param[in] data Protocol-specific data for the start operation\n> + * \\param[out] result Result of the start operation\n>   *\n>   * This method informs the IPA module that the camera is about to be started.\n>   * The IPA module shall prepare any resources it needs to operate.\n>   *\n> + * The \\a data and \\a result parameters carry custom data passed by the\n> + * pipeline handler to the IPA and back. The pipeline handler may set the \\a\n> + * result parameter to null if the IPA protocol doesn't need to pass a result\n> + * back through the start() function.\n> + *\n>   * \\return 0 on success or a negative error code otherwise\n>   */\n>  \n> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> index 9937db73..bafd0b2d 100644\n> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> @@ -752,7 +752,10 @@ int PipelineHandlerRPi::start(Camera *camera, [[maybe_unused]] ControlList *cont\n>  \t}\n>  \n>  \t/* Start the IPA. */\n> -\tret = data->ipa_->start();\n> +\tIPAOperationData ipaData = {}, result = {};\n\nWe usually split variable declarations to one per line.\n\nI'd propose adding a default constructor to IPAOperationData to set\noperation to 0 instead of forcing explicit initialization everywhere,\nbut IPAOperationData will soon go away.\n\n> +\tif (controls)\n> +\t\tipaData.controls.emplace_back(*controls);\n> +\tret = data->ipa_->start(ipaData, &result);\n>  \tif (ret) {\n>  \t\tLOG(RPI, Error)\n>  \t\t\t<< \"Failed to start IPA for \" << camera->id();\n> @@ -1189,7 +1192,7 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)\n>  \t}\n>  \n>  \t/* Ready the IPA - it must know about the sensor resolution. */\n> -\tIPAOperationData result;\n> +\tIPAOperationData result = {};\n\nIs this needed, or just a drive-by change ?\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n>  \n>  \tipa_->configure(sensorInfo_, streamConfig, entityControls, ipaConfig,\n>  \t\t\t&result);\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 4e959fde..eaa10f9f 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -842,7 +842,8 @@ int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] ControlList *c\n>  \tif (ret)\n>  \t\treturn ret;\n>  \n> -\tret = data->ipa_->start();\n> +\tIPAOperationData ipaData = {};\n> +\tret = data->ipa_->start(ipaData, nullptr);\n>  \tif (ret) {\n>  \t\tfreeBuffers(camera);\n>  \t\tLOG(RkISP1, Error)\n> diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\n> index d81b8598..2a5054a8 100644\n> --- a/src/libcamera/pipeline/vimc/vimc.cpp\n> +++ b/src/libcamera/pipeline/vimc/vimc.cpp\n> @@ -322,7 +322,8 @@ int PipelineHandlerVimc::start(Camera *camera, [[maybe_unused]] ControlList *con\n>  \tif (ret < 0)\n>  \t\treturn ret;\n>  \n> -\tret = data->ipa_->start();\n> +\tIPAOperationData ipaData = {};\n> +\tret = data->ipa_->start(ipaData, nullptr);\n>  \tif (ret) {\n>  \t\tdata->video_->releaseBuffers();\n>  \t\treturn ret;\n> diff --git a/src/libcamera/proxy/ipa_proxy_linux.cpp b/src/libcamera/proxy/ipa_proxy_linux.cpp\n> index b78a0e45..ea6f3e5e 100644\n> --- a/src/libcamera/proxy/ipa_proxy_linux.cpp\n> +++ b/src/libcamera/proxy/ipa_proxy_linux.cpp\n> @@ -30,7 +30,8 @@ public:\n>  \t{\n>  \t\treturn 0;\n>  \t}\n> -\tint start() override { return 0; }\n> +\tint start([[maybe_unused]] const IPAOperationData &data,\n> +\t\t  [[maybe_unused]] IPAOperationData *result) override { return 0; }\n>  \tvoid stop() override {}\n>  \tvoid configure([[maybe_unused]] const CameraSensorInfo &sensorInfo,\n>  \t\t       [[maybe_unused]] const std::map<unsigned int, IPAStream> &streamConfig,\n> diff --git a/src/libcamera/proxy/ipa_proxy_thread.cpp b/src/libcamera/proxy/ipa_proxy_thread.cpp\n> index eead2883..a5fda2c8 100644\n> --- a/src/libcamera/proxy/ipa_proxy_thread.cpp\n> +++ b/src/libcamera/proxy/ipa_proxy_thread.cpp\n> @@ -26,7 +26,8 @@ public:\n>  \tIPAProxyThread(IPAModule *ipam);\n>  \n>  \tint init(const IPASettings &settings) override;\n> -\tint start() override;\n> +\tint start(const IPAOperationData &data,\n> +\t\t  IPAOperationData *result) override;\n>  \tvoid stop() override;\n>  \n>  \tvoid configure(const CameraSensorInfo &sensorInfo,\n> @@ -50,9 +51,9 @@ private:\n>  \t\t\tipa_ = ipa;\n>  \t\t}\n>  \n> -\t\tint start()\n> +\t\tint start(const IPAOperationData &data, IPAOperationData *result)\n>  \t\t{\n> -\t\t\treturn ipa_->start();\n> +\t\t\treturn ipa_->start(data, result);\n>  \t\t}\n>  \n>  \t\tvoid stop()\n> @@ -111,12 +112,14 @@ int IPAProxyThread::init(const IPASettings &settings)\n>  \treturn 0;\n>  }\n>  \n> -int IPAProxyThread::start()\n> +int IPAProxyThread::start(const IPAOperationData &data,\n> +\t\t\t  IPAOperationData *result)\n>  {\n>  \trunning_ = true;\n>  \tthread_.start();\n>  \n> -\treturn proxy_.invokeMethod(&ThreadProxy::start, ConnectionTypeBlocking);\n> +\treturn proxy_.invokeMethod(&ThreadProxy::start, ConnectionTypeBlocking,\n> +\t\t\t\t   data, result);\n>  }\n>  \n>  void IPAProxyThread::stop()\n> diff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp\n> index 9f575f93..dbb6727f 100644\n> --- a/test/ipa/ipa_interface_test.cpp\n> +++ b/test/ipa/ipa_interface_test.cpp\n> @@ -120,7 +120,8 @@ protected:\n>  \t\t}\n>  \n>  \t\t/* Test start of IPA module. */\n> -\t\tipa_->start();\n> +\t\tIPAOperationData data = {};\n> +\t\tipa_->start(data, nullptr);\n>  \t\ttimer.start(1000);\n>  \t\twhile (timer.isRunning() && trace_ != IPAOperationStart)\n>  \t\t\tdispatcher->processEvents();\n> diff --git a/test/ipa/ipa_wrappers_test.cpp b/test/ipa/ipa_wrappers_test.cpp\n> index 59d991cb..47533d10 100644\n> --- a/test/ipa/ipa_wrappers_test.cpp\n> +++ b/test/ipa/ipa_wrappers_test.cpp\n> @@ -56,7 +56,8 @@ public:\n>  \t\treturn 0;\n>  \t}\n>  \n> -\tint start() override\n> +\tint start([[maybe_unused]] const IPAOperationData &data,\n> +\t\t  [[maybe_unused]] IPAOperationData *result) override\n>  \t{\n>  \t\treport(Op_start, TestPass);\n>  \t\treturn 0;\n> @@ -376,7 +377,7 @@ protected:\n>  \t\t\treturn TestFail;\n>  \t\t}\n>  \n> -\t\tret = INVOKE(start);\n> +\t\tret = INVOKE(start, ipaConfig, nullptr);\n>  \t\tif (ret == TestFail) {\n>  \t\t\tcerr << \"Failed to run start()\";\n>  \t\t\treturn TestFail;","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id A81D8BDB20\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat,  5 Dec 2020 21:23:02 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 31811615AF;\n\tSat,  5 Dec 2020 22:23:02 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id EB6D060327\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat,  5 Dec 2020 22:22:59 +0100 (CET)","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 6BBB9D2F;\n\tSat,  5 Dec 2020 22:22:59 +0100 (CET)"],"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=\"dySMPzsS\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1607203379;\n\tbh=2l0+gZsGEmzJhf3Z7VdC+AKKq/1SlU+XxIYRZsttkZI=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=dySMPzsSRuvZk3m1MNzeUxsaMORFZTSmV3ZU1+W966/Qp/YwkwMo+Bp6T8PuFPLNr\n\tOZWgiByULUdzd32UiJ1oYvyUaJN/yIwr87Azz0ob9+2yaOwaNTJ3eRU3o6WlL+KpZX\n\teYQfIeS3fMHjIB5b752h3wHvdDaz7E83GFZjFbVM=","Date":"Sat, 5 Dec 2020 23:22:58 +0200","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Naushir Patuck <naush@raspberrypi.com>","Message-ID":"<X8v6MpXQqsLFIVSx@pendragon.ideasonboard.com>","References":"<20201204153121.66136-1-naush@raspberrypi.com>\n\t<20201204153121.66136-3-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201204153121.66136-3-naush@raspberrypi.com>","Subject":"Re: [libcamera-devel] [PATCH v3 2/3] libcamera: ipa: Pass a set of\n\tcontrols and return results from ipa::start()","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]