[{"id":3823,"web_url":"https://patchwork.libcamera.org/comment/3823/","msgid":"<20200220204352.GN4998@pendragon.ideasonboard.com>","date":"2020-02-20T20:43:52","subject":"Re: [libcamera-devel] [PATCH v3 4/6] libcamera: ipa_manager:\n\tRe-arrange IPA precedence","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nThank you for the patch.\n\nOn Thu, Feb 20, 2020 at 04:57:02PM +0000, Kieran Bingham wrote:\n> Setting a user environment path in LIBCAMERA_IPA_MODULE_PATH should take\n> precedence over the system loading locations.\n> \n> Adjust the IPA search orders accordingly.\n> \n> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> ---\n>  src/libcamera/ipa_manager.cpp | 20 ++++++++++----------\n>  1 file changed, 10 insertions(+), 10 deletions(-)\n> \n> diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\n> index c30b4555290f..3b1d4c0b295e 100644\n> --- a/src/libcamera/ipa_manager.cpp\n> +++ b/src/libcamera/ipa_manager.cpp\n> @@ -98,24 +98,24 @@ IPAManager::IPAManager()\n>  \tunsigned int ipaCount = 0;\n>  \tint ret;\n>  \n> -\tret = addDir(IPA_MODULE_DIR);\n> -\tif (ret > 0)\n> -\t\tipaCount += ret;\n> -\n> +\t/* User specified paths take precedence. */\n\ns/User specified/User-specified/ ?\n\n>  \tconst char *modulePaths = utils::secure_getenv(\"LIBCAMERA_IPA_MODULE_PATH\");\n> -\tif (!modulePaths) {\n> +\tif (modulePaths) {\n> +\t\tipaCount += addPath(modulePaths);\n> +\n>  \t\tif (!ipaCount)\n>  \t\t\tLOG(IPAManager, Warning)\n> -\t\t\t\t<< \"No IPA found in '\" IPA_MODULE_DIR \"'\";\n> -\t\treturn;\n> +\t\t\t\t<< \"No IPA found in '\" << modulePaths << \"'\";\n>  \t}\n>  \n> -\tipaCount += addPath(modulePaths);\n> +\t/* Load IPAs from the installed system path. */\n> +\tret = addDir(IPA_MODULE_DIR);\n> +\tif (ret > 0)\n> +\t\tipaCount += ret;\n>  \n>  \tif (!ipaCount)\n>  \t\tLOG(IPAManager, Warning)\n> -\t\t\t<< \"No IPA found in '\" IPA_MODULE_DIR \"' and '\"\n> -\t\t\t<< modulePaths << \"'\";\n> +\t\t\t<< \"No IPA found in '\" IPA_MODULE_DIR \"'\";\n\nI like the warning messages better now. A message will be printed if\nLIBCAMERA_IPA_MODULE_PATH is set and no IPA module is found there, which\nis a sign of a potential issue, and then another error will be printed\nif no IPA modules are found at all, mentioning IPA_MODULE_DIR.\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n>  }\n>  \n>  IPAManager::~IPAManager()","headers":{"Return-Path":"<laurent.pinchart@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 252D160434\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 20 Feb 2020 21:44:12 +0100 (CET)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7D46A563;\n\tThu, 20 Feb 2020 21:44:11 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1582231451;\n\tbh=1jdXRnhwga7mTse+EB0S2+fTYEMnid+TQSuikW/OY4U=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=OfEXoV4rA+xOtOYYGCOtZyDpLRUbfoRckdPNeiJ9L7i/Cm0B/QVZVSelJjSDQ/65j\n\ts1M/M9MMopiKRzaJCxee3/UBasqAuDnBe2smzqnoQqu70IiQ/0BK7vx5koPL5oQqnU\n\tio2LlVOq8xJ03sK2ec8UykacLxX/xZUO9yXJUZto=","Date":"Thu, 20 Feb 2020 22:43:52 +0200","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Cc":"libcamera devel <libcamera-devel@lists.libcamera.org>","Message-ID":"<20200220204352.GN4998@pendragon.ideasonboard.com>","References":"<20200220165704.23600-1-kieran.bingham@ideasonboard.com>\n\t<20200220165704.23600-5-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20200220165704.23600-5-kieran.bingham@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH v3 4/6] libcamera: ipa_manager:\n\tRe-arrange IPA precedence","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":"Thu, 20 Feb 2020 20:44:12 -0000"}}]