{"id":17966,"url":"https://patchwork.libcamera.org/api/1.1/patches/17966/?format=json","web_url":"https://patchwork.libcamera.org/patch/17966/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20221209090050.19441-3-naush@raspberrypi.com>","date":"2022-12-09T09:00:40","name":"[libcamera-devel,v4,02/12] libcamera: pipeline: Add a platform configuration file helper","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"f257b7f3172da623fbca4630aba41b0a7ab73887","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/1.1/people/34/?format=json","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/17966/mbox/","series":[{"id":3663,"url":"https://patchwork.libcamera.org/api/1.1/series/3663/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3663","date":"2022-12-09T09:00:38","name":"Raspberry Pi: Platform configuration and buffer allocation improvements","version":4,"mbox":"https://patchwork.libcamera.org/series/3663/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/17966/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/17966/checks/","tags":{},"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 E6E4CBDE6B\n\tfor ;\n\tFri, 9 Dec 2022 09:01:33 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 76DB46335A;\n\tFri, 9 Dec 2022 10:01:33 +0100 (CET)","from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com\n\t[IPv6:2a00:1450:4864:20::32d])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2D3BB61F1E\n\tfor ;\n\tFri, 9 Dec 2022 10:01:30 +0100 (CET)","by mail-wm1-x32d.google.com with SMTP id\n\tv124-20020a1cac82000000b003cf7a4ea2caso5258199wme.5\n\tfor ;\n\tFri, 09 Dec 2022 01:01:30 -0800 (PST)","from naush-laptop.localdomain ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\tbd10-20020a05600c1f0a00b003cf774c31a0sm7773674wmb.16.2022.12.09.01.01.28\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 09 Dec 2022 01:01:28 -0800 (PST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1670576493;\n\tbh=aPx61EyK5426KHTbbJ5ftutp6M7sRBs01qIVaRATqP8=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=Q1mQ+0s84kxml93hA37Ye5kDN3Vbbb3n16TgH0ugW1Rb8P8OYDM5jfgPw8M5AOtjC\n\tn1gqLbyI2gWNhFCY595BEvIt6zwBbdTT1VDkA44o85tg/oicfuTSyuxHYkpLYjUyoX\n\tIPS5TGzwSNBR8L6iGamtKk/5VAe6+8AJyVIWETzPGLDyRMKDG0wcggJmzGF7WqABI5\n\tLaixJKH79CJ8j3NFXbbkcW7Wmsmo6T2CIidvwTnJq+DAt+oA5LFwQk9aktbDXjQ3Sq\n\tSyO2g+GhUWp9SIHRPq8KUp+8x0j3EvoqtBtvw4VhXejsA0b8mrfIKWxArsnkiGTzGe\n\tmZSIE3LL7/rHg==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=gYE4rAs6mWLRRzePAtTOx6PsgAWDmX1Qry7rwDpq1OM=;\n\tb=fSS9WgmGx/w2uBE7dksCGM9VWJOUEO0d/LYazmZ2RZH5E/TOoM70o9YRwG2xQCunUR\n\tPQtxtXiPFTFvUdsxNbi13uMMN0lQozeO0QArjdLn/G4+wtdtZuVQdsrsg1OkRtSYVvTS\n\tfvM3L6g2WVEth9bsC9iuA7/DsJe7v/2lnZvRWzY+H2jlM0qebKS2bEA8utEufa/iCkv7\n\tPD6aU8ajL1prJxIcP0+93XVUpIb4AAmOjnzbbDoeWikRRzkI7Y3GCWNflx/V8cHGWAcQ\n\tG2j1oQOQ4rjmVmHf3M/vtlRu4Ue2nwpPTwlDuKeWL4faYksS0yBZE+7kEYie/kIKTVl2\n\tOOYQ=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"fSS9WgmG\"; dkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=gYE4rAs6mWLRRzePAtTOx6PsgAWDmX1Qry7rwDpq1OM=;\n\tb=ZvAe7CmE2LaRLoH9qKM391sXh1V/zMWFSyrHHbVIZphFZhZyQaCVmamx08H7LViV9u\n\tXbbrppTleQPNkq5e38X8PMBQ2LCt1CXmAx2O9NccHdWNsP9qDm0lR3V3rTslXmf9fiAc\n\tFbsAc8GX+1ITz4v3hV6oKDzFMlaIv2EnzmdJBPyQ6SI7QbukabhG+rZxrTe8iv6E2xk+\n\trVhF8X+CDUBpanvLuOkkJgGAWysRQnVpYLgkGKfQ7+dM0IdsrFTzdkCczR8gO3PqzP53\n\tHP8r80aQ28s2x3O46Id7ZuBskkEQ0+PjKf9Y+XdQ4dKdin7B8Z3dsc19NkOdp/aWnTQe\n\t518A==","X-Gm-Message-State":"ANoB5plyrff5OYbGA/m+MUsiDAe5NND+P+2ys41xcJ8RXCRDhEhSITcK\n\tKTaTz7ubbL6DygAU3yravtRb2NdPdUU/sDCa","X-Google-Smtp-Source":"AA0mqf5c9063c+cCV0nhviTdCoLr9+rXzu9TdP6/8gK0CXvBNAEx6/w28V66vKd+7tMdokN/jl4MAw==","X-Received":"by 2002:a1c:7316:0:b0:3c6:e60f:3f66 with SMTP id\n\td22-20020a1c7316000000b003c6e60f3f66mr4282831wmb.29.1670576489598; \n\tFri, 09 Dec 2022 01:01:29 -0800 (PST)","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 9 Dec 2022 09:00:40 +0000","Message-Id":"<20221209090050.19441-3-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20221209090050.19441-1-naush@raspberrypi.com>","References":"<20221209090050.19441-1-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 02/12] libcamera: pipeline: Add a\n\tplatform configuration file helper","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","From":"Naushir Patuck via libcamera-devel\n\t","Reply-To":"Naushir Patuck ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add a new helper function PipelineHandler::configurationFile() that returns\nthe full path of a named configuration file. This configuration file may be read\nby pipeline handlers for platform specific configuration parameters on\ninitialisation.\n\nThe mechanism for searching for the configuration file is similar to the IPA\nconfiguration file:\n\n- In the source tree if libcamera is not installed\n- Otherwise in standard system locations (etc and share directories).\n\nWhen stored in the source tree, configuration files shall be located in a 'data'\nsubdirectory of their respective pipeline handler directory.\n\nSigned-off-by: Naushir Patuck \nReviewed-by: David Plowman \n---\n include/libcamera/internal/pipeline_handler.h | 3 +\n src/libcamera/pipeline_handler.cpp | 60 +++++++++++++++++++\n 2 files changed, 63 insertions(+)","diff":"diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\nindex ec4f662d7399..4c4dfe62a680 100644\n--- a/include/libcamera/internal/pipeline_handler.h\n+++ b/include/libcamera/internal/pipeline_handler.h\n@@ -65,6 +65,9 @@ public:\n \tbool completeBuffer(Request *request, FrameBuffer *buffer);\n \tvoid completeRequest(Request *request);\n \n+\tstd::string configurationFile(const std::string &subdir,\n+\t\t\t\t const std::string &name) const;\n+\n \tconst char *name() const { return name_; }\n \n protected:\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex cfade4908118..a515ad5ecffb 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -8,6 +8,7 @@\n #include \"libcamera/internal/pipeline_handler.h\"\n \n #include \n+#include \n #include \n \n #include \n@@ -534,6 +535,65 @@ void PipelineHandler::completeRequest(Request *request)\n \t}\n }\n \n+/**\n+ * \\brief Retrieve the absolute path to a platform configuration file\n+ * \\param[in] subdir The pipeline handler specific subdirectory name\n+ * \\param[in] name The configuration file name\n+ *\n+ * This function locates a named platform configuration file and returns\n+ * its absolute path to the pipeline handler. It searches the following\n+ * directories, in order:\n+ *\n+ * - If libcamera is not installed, the src/libcamera/pipeline//data/\n+ * directory within the source tree ; otherwise\n+ * - The system data (share/libcamera/pipeline/) directory.\n+ *\n+ * The system directories are not searched if libcamera is not installed.\n+ *\n+ * \\return The full path to the pipeline handler configuration file, or an empty\n+ * string if no configuration file can be found\n+ */\n+std::string PipelineHandler::configurationFile(const std::string &subdir,\n+\t\t\t\t\t const std::string &name) const\n+{\n+\tstd::string confPath;\n+\tstruct stat statbuf;\n+\tint ret;\n+\n+\tstd::string root = utils::libcameraSourcePath();\n+\tif (!root.empty()) {\n+\t\t/*\n+\t\t * When libcamera is used before it is installed, load\n+\t\t * configuration files from the source directory. The\n+\t\t * configuration files are then located in the 'data'\n+\t\t * subdirectory of the corresponding pipeline handler.\n+\t\t */\n+\t\tstd::string confDir = root + \"src/libcamera/pipeline/\";\n+\t\tconfPath = confDir + subdir + \"/data/\" + name;\n+\n+\t\tLOG(Pipeline, Info)\n+\t\t\t<< \"libcamera is not installed. Loading platform configuration file from '\"\n+\t\t\t<< confPath << \"'\";\n+\n+\t\tret = stat(confPath.c_str(), &statbuf);\n+\t\tif (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)\n+\t\t\treturn confPath;\n+\t} else {\n+\t\t/* Else look in the system locations. */\n+\t\tconfPath = std::string(LIBCAMERA_DATA_DIR)\n+\t\t\t\t+ \"/pipeline/\" + subdir + '/' + name;\n+\t\tret = stat(confPath.c_str(), &statbuf);\n+\t\tif (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)\n+\t\t\treturn confPath;\n+\t}\n+\n+\tLOG(Pipeline, Error)\n+\t\t<< \"Configuration file '\" << confPath\n+\t\t<< \"' not found for pipeline handler '\" << PipelineHandler::name() << \"'\";\n+\n+\treturn std::string();\n+}\n+\n /**\n * \\brief Register a camera to the camera manager and pipeline handler\n * \\param[in] camera The camera to be added\n","prefixes":["libcamera-devel","v4","02/12"]}