[{"id":3031,"web_url":"https://patchwork.libcamera.org/comment/3031/","msgid":"<20191115165821.6upxdd65cuhp4tf4@uno.localdomain>","date":"2019-11-15T16:58:21","subject":"Re: [libcamera-devel] [PATCH v2 18/24] ipa: Pass ControlInfoMap\n\treferences to IPAInterface::configure()","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent,\n\nOn Fri, Nov 08, 2019 at 10:54:03PM +0200, Laurent Pinchart wrote:\n> The IPAInterface::configure() operation receives a map of ControlInfoMap\n> instances. Pass const references instead to avoid copies when not\n> required (the callee can still make manual copies), and to allow for the\n> future serialization layer to keep references to the original object.\n\nMuch better\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n\nThanks\n   j\n>\n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> ---\n>  include/ipa/ipa_interface.h              | 2 +-\n>  src/ipa/ipa_vimc.cpp                     | 2 +-\n>  src/ipa/rkisp1/rkisp1.cpp                | 4 ++--\n>  src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n>  src/libcamera/proxy/ipa_proxy_linux.cpp  | 2 +-\n>  5 files changed, 6 insertions(+), 6 deletions(-)\n>\n> diff --git a/include/ipa/ipa_interface.h b/include/ipa/ipa_interface.h\n> index 8fd658af5fdb..35dc4b4e3165 100644\n> --- a/include/ipa/ipa_interface.h\n> +++ b/include/ipa/ipa_interface.h\n> @@ -43,7 +43,7 @@ public:\n>  \tvirtual int init() = 0;\n>\n>  \tvirtual void configure(const std::map<unsigned int, IPAStream> &streamConfig,\n> -\t\t\t       const std::map<unsigned int, ControlInfoMap> &entityControls) = 0;\n> +\t\t\t       const std::map<unsigned int, const ControlInfoMap &> &entityControls) = 0;\n>\n>  \tvirtual void mapBuffers(const std::vector<IPABuffer> &buffers) = 0;\n>  \tvirtual void unmapBuffers(const std::vector<unsigned int> &ids) = 0;\n> diff --git a/src/ipa/ipa_vimc.cpp b/src/ipa/ipa_vimc.cpp\n> index 9fd5212b0381..50ca8dd805fb 100644\n> --- a/src/ipa/ipa_vimc.cpp\n> +++ b/src/ipa/ipa_vimc.cpp\n> @@ -31,7 +31,7 @@ public:\n>\n>  \tint init() override;\n>  \tvoid configure(const std::map<unsigned int, IPAStream> &streamConfig,\n> -\t\t       const std::map<unsigned int, ControlInfoMap> &entityControls) override {}\n> +\t\t       const std::map<unsigned int, const ControlInfoMap &> &entityControls) override {}\n>  \tvoid mapBuffers(const std::vector<IPABuffer> &buffers) override {}\n>  \tvoid unmapBuffers(const std::vector<unsigned int> &ids) override {}\n>  \tvoid processEvent(const IPAOperationData &event) override {}\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index d741d5677d0e..41babf0c4140 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -33,7 +33,7 @@ public:\n>  \tint init() override { return 0; }\n>\n>  \tvoid configure(const std::map<unsigned int, IPAStream> &streamConfig,\n> -\t\t       const std::map<unsigned int, ControlInfoMap> &entityControls) override;\n> +\t\t       const std::map<unsigned int, const ControlInfoMap &> &entityControls) override;\n>  \tvoid mapBuffers(const std::vector<IPABuffer> &buffers) override;\n>  \tvoid unmapBuffers(const std::vector<unsigned int> &ids) override;\n>  \tvoid processEvent(const IPAOperationData &event) override;\n> @@ -62,7 +62,7 @@ private:\n>  };\n>\n>  void IPARkISP1::configure(const std::map<unsigned int, IPAStream> &streamConfig,\n> -\t\t\t  const std::map<unsigned int, ControlInfoMap> &entityControls)\n> +\t\t\t  const std::map<unsigned int, const ControlInfoMap &> &entityControls)\n>  {\n>  \tif (entityControls.empty())\n>  \t\treturn;\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index b21cf92435e7..4a583a7a1d7e 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -777,7 +777,7 @@ int PipelineHandlerRkISP1::start(Camera *camera)\n>  \t\t.size = data->stream_.configuration().size,\n>  \t};\n>\n> -\tstd::map<unsigned int, ControlInfoMap> entityControls;\n> +\tstd::map<unsigned int, const ControlInfoMap &> entityControls;\n>  \tentityControls.emplace(0, data->sensor_->controls());\n>\n>  \tdata->ipa_->configure(streamConfig, entityControls);\n> diff --git a/src/libcamera/proxy/ipa_proxy_linux.cpp b/src/libcamera/proxy/ipa_proxy_linux.cpp\n> index 27b6639d6312..c7218fb47249 100644\n> --- a/src/libcamera/proxy/ipa_proxy_linux.cpp\n> +++ b/src/libcamera/proxy/ipa_proxy_linux.cpp\n> @@ -28,7 +28,7 @@ public:\n>\n>  \tint init() override { return 0; }\n>  \tvoid configure(const std::map<unsigned int, IPAStream> &streamConfig,\n> -\t\t       const std::map<unsigned int, ControlInfoMap> &entityControls) override {}\n> +\t\t       const std::map<unsigned int, const ControlInfoMap &> &entityControls) override {}\n>  \tvoid mapBuffers(const std::vector<IPABuffer> &buffers) override {}\n>  \tvoid unmapBuffers(const std::vector<unsigned int> &ids) override {}\n>  \tvoid processEvent(const IPAOperationData &event) override {}\n> --\n> Regards,\n>\n> Laurent Pinchart\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"<jacopo@jmondi.org>","Received":["from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6D0E46136F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 15 Nov 2019 17:56:20 +0100 (CET)","from uno.localdomain (2-224-242-101.ip172.fastwebnet.it\n\t[2.224.242.101]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay11.mail.gandi.net (Postfix) with ESMTPSA id 0143010001D;\n\tFri, 15 Nov 2019 16:56:19 +0000 (UTC)"],"Date":"Fri, 15 Nov 2019 17:58:21 +0100","From":"Jacopo Mondi <jacopo@jmondi.org>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20191115165821.6upxdd65cuhp4tf4@uno.localdomain>","References":"<20191108205409.18845-1-laurent.pinchart@ideasonboard.com>\n\t<20191108205409.18845-19-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"hshkgnm7hgesea2f\"","Content-Disposition":"inline","In-Reply-To":"<20191108205409.18845-19-laurent.pinchart@ideasonboard.com>","User-Agent":"NeoMutt/20180716","Subject":"Re: [libcamera-devel] [PATCH v2 18/24] ipa: Pass ControlInfoMap\n\treferences to IPAInterface::configure()","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>","X-List-Received-Date":"Fri, 15 Nov 2019 16:56:20 -0000"}},{"id":3083,"web_url":"https://patchwork.libcamera.org/comment/3083/","msgid":"<20191118215557.GM8072@bigcity.dyn.berto.se>","date":"2019-11-18T21:55:57","subject":"Re: [libcamera-devel] [PATCH v2 18/24] ipa: Pass ControlInfoMap\n\treferences to IPAInterface::configure()","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your patch.\n\nOn 2019-11-08 22:54:03 +0200, Laurent Pinchart wrote:\n> The IPAInterface::configure() operation receives a map of ControlInfoMap\n> instances. Pass const references instead to avoid copies when not\n> required (the callee can still make manual copies), and to allow for the\n> future serialization layer to keep references to the original object.\n> \n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n\n> ---\n>  include/ipa/ipa_interface.h              | 2 +-\n>  src/ipa/ipa_vimc.cpp                     | 2 +-\n>  src/ipa/rkisp1/rkisp1.cpp                | 4 ++--\n>  src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n>  src/libcamera/proxy/ipa_proxy_linux.cpp  | 2 +-\n>  5 files changed, 6 insertions(+), 6 deletions(-)\n> \n> diff --git a/include/ipa/ipa_interface.h b/include/ipa/ipa_interface.h\n> index 8fd658af5fdb..35dc4b4e3165 100644\n> --- a/include/ipa/ipa_interface.h\n> +++ b/include/ipa/ipa_interface.h\n> @@ -43,7 +43,7 @@ public:\n>  \tvirtual int init() = 0;\n>  \n>  \tvirtual void configure(const std::map<unsigned int, IPAStream> &streamConfig,\n> -\t\t\t       const std::map<unsigned int, ControlInfoMap> &entityControls) = 0;\n> +\t\t\t       const std::map<unsigned int, const ControlInfoMap &> &entityControls) = 0;\n>  \n>  \tvirtual void mapBuffers(const std::vector<IPABuffer> &buffers) = 0;\n>  \tvirtual void unmapBuffers(const std::vector<unsigned int> &ids) = 0;\n> diff --git a/src/ipa/ipa_vimc.cpp b/src/ipa/ipa_vimc.cpp\n> index 9fd5212b0381..50ca8dd805fb 100644\n> --- a/src/ipa/ipa_vimc.cpp\n> +++ b/src/ipa/ipa_vimc.cpp\n> @@ -31,7 +31,7 @@ public:\n>  \n>  \tint init() override;\n>  \tvoid configure(const std::map<unsigned int, IPAStream> &streamConfig,\n> -\t\t       const std::map<unsigned int, ControlInfoMap> &entityControls) override {}\n> +\t\t       const std::map<unsigned int, const ControlInfoMap &> &entityControls) override {}\n>  \tvoid mapBuffers(const std::vector<IPABuffer> &buffers) override {}\n>  \tvoid unmapBuffers(const std::vector<unsigned int> &ids) override {}\n>  \tvoid processEvent(const IPAOperationData &event) override {}\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index d741d5677d0e..41babf0c4140 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -33,7 +33,7 @@ public:\n>  \tint init() override { return 0; }\n>  \n>  \tvoid configure(const std::map<unsigned int, IPAStream> &streamConfig,\n> -\t\t       const std::map<unsigned int, ControlInfoMap> &entityControls) override;\n> +\t\t       const std::map<unsigned int, const ControlInfoMap &> &entityControls) override;\n>  \tvoid mapBuffers(const std::vector<IPABuffer> &buffers) override;\n>  \tvoid unmapBuffers(const std::vector<unsigned int> &ids) override;\n>  \tvoid processEvent(const IPAOperationData &event) override;\n> @@ -62,7 +62,7 @@ private:\n>  };\n>  \n>  void IPARkISP1::configure(const std::map<unsigned int, IPAStream> &streamConfig,\n> -\t\t\t  const std::map<unsigned int, ControlInfoMap> &entityControls)\n> +\t\t\t  const std::map<unsigned int, const ControlInfoMap &> &entityControls)\n>  {\n>  \tif (entityControls.empty())\n>  \t\treturn;\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index b21cf92435e7..4a583a7a1d7e 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -777,7 +777,7 @@ int PipelineHandlerRkISP1::start(Camera *camera)\n>  \t\t.size = data->stream_.configuration().size,\n>  \t};\n>  \n> -\tstd::map<unsigned int, ControlInfoMap> entityControls;\n> +\tstd::map<unsigned int, const ControlInfoMap &> entityControls;\n>  \tentityControls.emplace(0, data->sensor_->controls());\n>  \n>  \tdata->ipa_->configure(streamConfig, entityControls);\n> diff --git a/src/libcamera/proxy/ipa_proxy_linux.cpp b/src/libcamera/proxy/ipa_proxy_linux.cpp\n> index 27b6639d6312..c7218fb47249 100644\n> --- a/src/libcamera/proxy/ipa_proxy_linux.cpp\n> +++ b/src/libcamera/proxy/ipa_proxy_linux.cpp\n> @@ -28,7 +28,7 @@ public:\n>  \n>  \tint init() override { return 0; }\n>  \tvoid configure(const std::map<unsigned int, IPAStream> &streamConfig,\n> -\t\t       const std::map<unsigned int, ControlInfoMap> &entityControls) override {}\n> +\t\t       const std::map<unsigned int, const ControlInfoMap &> &entityControls) override {}\n>  \tvoid mapBuffers(const std::vector<IPABuffer> &buffers) override {}\n>  \tvoid unmapBuffers(const std::vector<unsigned int> &ids) override {}\n>  \tvoid processEvent(const IPAOperationData &event) override {}\n> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"<niklas.soderlund@ragnatech.se>","Received":["from mail-lj1-x244.google.com (mail-lj1-x244.google.com\n\t[IPv6:2a00:1450:4864:20::244])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C70D760F1C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 18 Nov 2019 22:55:59 +0100 (CET)","by mail-lj1-x244.google.com with SMTP id y23so20760983ljh.10\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 18 Nov 2019 13:55:59 -0800 (PST)","from localhost (h-93-159.A463.priv.bahnhof.se. [46.59.93.159])\n\tby smtp.gmail.com with ESMTPSA id\n\ty6sm8611802ljm.95.2019.11.18.13.55.58\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 18 Nov 2019 13:55:58 -0800 (PST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to\n\t:user-agent; bh=2WWo/zjZy6ze7Yl2EGEA+kCaKtXXmOS1Or53+TnWXjg=;\n\tb=ZDIUQw6ezF5ecjJ3CS863eIPCVPvkE0J3WlIoVS0MbiLWDVKHw2yZ5WouTnRZ69brg\n\ttMKxIfaTlvMtcVcKMdARJSTnlvO/XH7mtvzc3CmKkSiZpEYtgHZpxD7FZxx575DW8O3c\n\tQthq50z1AmMZJULutnLBzCFSXixOPJI8evBODYmRjf9AxiY0XvHP2ztxDgAWRMpmiAa5\n\tf8BRBrjB5nXbNwvuQtIgZLm0s25NXPMyfSq77Z/IVcibWVn6W9+RlMmtcTsTAzgFIhC5\n\tZJIeUX/tu4/pIE/rdNXyJPueLBXZQmMkvea1AHzOWQK980vOGjOD9bTlK2wvfiQweoYU\n\t6bhg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to:user-agent;\n\tbh=2WWo/zjZy6ze7Yl2EGEA+kCaKtXXmOS1Or53+TnWXjg=;\n\tb=Paw+13RmHZA9TOyZnaYP+kJjLRVrSNQrthmO3W95bVu4Rjy4JTSaiqmyVPWSdx7vRc\n\t2AjTf9OnskOgZMssQKF/QXjFIrYkOCk+hRO/bVQOHYHSu5/zAxsHUxWZ/t7dxp24AnOY\n\thTAdF7oxmBXk3mC3n4qjbXgTFjaZ3dsr2S0ZX+FK1Pezutgk3vmJSFzqjdlxaXBe7WZV\n\t93F++cAH0J6tIN6BqRsmqV7GnCqwonPYMmI23jBO2TjODl8bGr8gI57DSlIwvFgqVUQ4\n\tf6K+8luNWQeAd8BaR/eju1PcQjWuBjblBWuxql9DmDBoSm11W7pohMk2PK/tpZvjW24/\n\tKcEw==","X-Gm-Message-State":"APjAAAUWqFEMsAzA1QpBxRwgWI6qzPKOZP5KEFWePwAQdfSaITiZfPsE\n\tY6TVAOyBRaQ7srLJ5BpMgIlz+Wj7Trw=","X-Google-Smtp-Source":"APXvYqxDoWz4kvwbitRkGTGZjJvz1bs9dDzY6fWuHjCwBUI1F1Jv+2Huz8t59qkWPzzGfbU2OxryBw==","X-Received":"by 2002:a2e:9985:: with SMTP id w5mr1163846lji.162.1574114159182;\n\tMon, 18 Nov 2019 13:55:59 -0800 (PST)","Date":"Mon, 18 Nov 2019 22:55:57 +0100","From":"Niklas =?iso-8859-1?q?S=F6derlund?= <niklas.soderlund@ragnatech.se>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20191118215557.GM8072@bigcity.dyn.berto.se>","References":"<20191108205409.18845-1-laurent.pinchart@ideasonboard.com>\n\t<20191108205409.18845-19-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20191108205409.18845-19-laurent.pinchart@ideasonboard.com>","User-Agent":"Mutt/1.12.1 (2019-06-15)","Subject":"Re: [libcamera-devel] [PATCH v2 18/24] ipa: Pass ControlInfoMap\n\treferences to IPAInterface::configure()","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>","X-List-Received-Date":"Mon, 18 Nov 2019 21:55:59 -0000"}}]