[{"id":14769,"web_url":"https://patchwork.libcamera.org/comment/14769/","msgid":"","date":"2021-01-26T08:14:24","subject":"Re: [libcamera-devel] [PATCH v2 1/5] ipa: raspberrypi: controller:\n\tReplace Raspberry Pi debug with libcamera debug","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi David,\n\nThank you for the patch.\n\nOn Mon, Jan 25, 2021 at 06:48:54PM +0000, David Plowman wrote:\n> Some unhelpful debug statements have been removed.\n> \n> Signed-off-by: David Plowman \n> Reviewed-by: Kieran Bingham \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/ipa/raspberrypi/controller/controller.cpp | 19 +++++++------------\n> 1 file changed, 7 insertions(+), 12 deletions(-)\n> \n> diff --git a/src/ipa/raspberrypi/controller/controller.cpp b/src/ipa/raspberrypi/controller/controller.cpp\n> index 22461cc4..96b58359 100644\n> --- a/src/ipa/raspberrypi/controller/controller.cpp\n> +++ b/src/ipa/raspberrypi/controller/controller.cpp\n> @@ -5,6 +5,8 @@\n> * controller.cpp - ISP controller\n> */\n> \n> +#include \"libcamera/internal/log.h\"\n> +\n> #include \"algorithm.hpp\"\n> #include \"controller.hpp\"\n> \n> @@ -12,6 +14,9 @@\n> #include \n> \n> using namespace RPiController;\n> +using namespace libcamera;\n> +\n> +LOG_DEFINE_CATEGORY(RPiController)\n> \n> Controller::Controller()\n> \t: switch_mode_called_(false) {}\n> @@ -27,7 +32,6 @@ Controller::~Controller() {}\n> \n> void Controller::Read(char const *filename)\n> {\n> -\tRPI_LOG(\"Controller starting\");\n> \tboost::property_tree::ptree root;\n> \tboost::property_tree::read_json(filename, root);\n> \tfor (auto const &key_and_value : root) {\n> @@ -36,10 +40,9 @@ void Controller::Read(char const *filename)\n> \t\t\talgo->Read(key_and_value.second);\n> \t\t\talgorithms_.push_back(AlgorithmPtr(algo));\n> \t\t} else\n> -\t\t\tRPI_LOG(\"WARNING: No algorithm found for \\\"\"\n> -\t\t\t\t<< key_and_value.first << \"\\\"\");\n> +\t\t\tLOG(RPiController, Warning)\n> +\t\t\t\t<< \"No algorithm found for \\\"\" << key_and_value.first << \"\\\"\";\n> \t}\n> -\tRPI_LOG(\"Controller finished\");\n> }\n> \n> Algorithm *Controller::CreateAlgorithm(char const *name)\n> @@ -50,39 +53,31 @@ Algorithm *Controller::CreateAlgorithm(char const *name)\n> \n> void Controller::Initialise()\n> {\n> -\tRPI_LOG(\"Controller starting\");\n> \tfor (auto &algo : algorithms_)\n> \t\talgo->Initialise();\n> -\tRPI_LOG(\"Controller finished\");\n> }\n> \n> void Controller::SwitchMode(CameraMode const &camera_mode, Metadata *metadata)\n> {\n> -\tRPI_LOG(\"Controller starting\");\n> \tfor (auto &algo : algorithms_)\n> \t\talgo->SwitchMode(camera_mode, metadata);\n> \tswitch_mode_called_ = true;\n> -\tRPI_LOG(\"Controller finished\");\n> }\n> \n> void Controller::Prepare(Metadata *image_metadata)\n> {\n> -\tRPI_LOG(\"Controller::Prepare starting\");\n> \tassert(switch_mode_called_);\n> \tfor (auto &algo : algorithms_)\n> \t\tif (!algo->IsPaused())\n> \t\t\talgo->Prepare(image_metadata);\n> -\tRPI_LOG(\"Controller::Prepare finished\");\n> }\n> \n> void Controller::Process(StatisticsPtr stats, Metadata *image_metadata)\n> {\n> -\tRPI_LOG(\"Controller::Process starting\");\n> \tassert(switch_mode_called_);\n> \tfor (auto &algo : algorithms_)\n> \t\tif (!algo->IsPaused())\n> \t\t\talgo->Process(stats, image_metadata);\n> -\tRPI_LOG(\"Controller::Process finished\");\n> }\n> \n> Metadata &Controller::GetGlobalMetadata()","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 EC1CBBD808\n\tfor ;\n\tTue, 26 Jan 2021 08:14:45 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5B41A682DE;\n\tTue, 26 Jan 2021 09:14:45 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 21ABF6030D\n\tfor ;\n\tTue, 26 Jan 2021 09:14:44 +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 89D3C2C1;\n\tTue, 26 Jan 2021 09:14:43 +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=\"Z0Ax9D1Z\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1611648883;\n\tbh=OIrGPsJ2pt5+1i2eD0DlwefShmWZc2Q79va7HdcqhIo=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Z0Ax9D1Zg1UIHVrnb/gHP82+UnHKiECT8p25RmG4aHRzF+yQ9qqlWh6BD22gR+4KC\n\tet4hfcVNpHTAtXZeoeGbPj041kj9SLabX3qqjXvqwTUhfEGaW9FActtSa9kJ2qXWcb\n\tbOxbuzk97BDxOoWx3zGHRRqKGJJQSP+kB6rkIz14=","Date":"Tue, 26 Jan 2021 10:14:24 +0200","From":"Laurent Pinchart ","To":"David Plowman ","Message-ID":"","References":"<20210125184858.16339-1-david.plowman@raspberrypi.com>\n\t<20210125184858.16339-2-david.plowman@raspberrypi.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210125184858.16339-2-david.plowman@raspberrypi.com>","Subject":"Re: [libcamera-devel] [PATCH v2 1/5] ipa: raspberrypi: controller:\n\tReplace Raspberry Pi debug with libcamera debug","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]