Patch Detail
Show a patch.
GET /api/patches/17945/?format=api
{ "id": 17945, "url": "https://patchwork.libcamera.org/api/patches/17945/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17945/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20221206135459.25521-3-naush@raspberrypi.com>", "date": "2022-12-06T13:54:48", "name": "[libcamera-devel,v3,02/13] 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/people/34/?format=api", "name": "Naushir Patuck", "email": "naush@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17945/mbox/", "series": [ { "id": 3659, "url": "https://patchwork.libcamera.org/api/series/3659/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3659", "date": "2022-12-06T13:54:46", "name": "Raspberry Pi: Platform configuration and buffer allocation improvements", "version": 3, "mbox": "https://patchwork.libcamera.org/series/3659/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17945/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17945/checks/", "tags": {}, "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 8CF2CBE08B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 6 Dec 2022 13:55:11 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E29CF63348;\n\tTue, 6 Dec 2022 14:55:08 +0100 (CET)", "from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com\n\t[IPv6:2a00:1450:4864:20::32f])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4CB4263339\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 6 Dec 2022 14:55:07 +0100 (CET)", "by mail-wm1-x32f.google.com with SMTP id\n\th8-20020a1c2108000000b003d1efd60b65so854302wmh.0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 06 Dec 2022 05:55:07 -0800 (PST)", "from naush-laptop.localdomain ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\tq6-20020a05600c2e4600b003c6bd91caa5sm19444059wmf.17.2022.12.06.05.55.05\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 06 Dec 2022 05:55:06 -0800 (PST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1670334908;\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=e56UvPGTKOcRiyYmvuQfd/emd3Y/LI966nYU2BLjHFqWofgs4vUy4As9E3cs8IIm+\n\t/gCwt0xqGbqI1BeNbXAiAKsHgYtjmRgldYRPl1YaIPlT2Q9pyuvdttWLnigqeu5fwt\n\t7OnlcN6U8GJdjDFBqeay3A2zPQ3+IC7TtrQ7aWXmh6rPO4el7hD4jcuwhprbQuG3zb\n\tPYmIUfas+w77ASHfvXSAydIpIf+cRNP4FM3Gp6hYgv51esJVCi+kVWs2qK+Zc6CeDr\n\tIuSS+NGBiZn9jhL4he2MU7SibtymRTZMNMRoz/+hEI8rbits0p2K/ntqfq63c4dwna\n\tdjnt2rzSrellQ==", "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=Wy20ClN5o6fkskoBBcqhHpoLE2PjRegwAaGM80tounQw+yN0xEFBWL9U4J/lNuxWl/\n\txypL1rf7kL3Q5JOInYIMu0HS3rWXTw24sem/PVQcY64OBucgPRpe3rWuleyjZG5WOBaA\n\tVzA9gxzHC+gWaiCyTk62kM1avUU/kUcfwu9kmfVoc8OZPxUKSo0HB03o+q4W88ns6itd\n\ttbPeEVDo1Od3ZNWf3nalcr4+aoZmoy4Sq/S2pIE/Ioedd0ok/Z9lAcPvvq39lo2TSgGU\n\tBhlrHCYyAg4Ro2X752aRXEnR6NpvAPKo29lSMQbLerYqfWAvtK5lWW6EuCmA9AJu6zg2\n\t+1Tw==" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"Wy20ClN5\"; 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=NOLgE6TmUUmSPidplqjr8Nj6TrBWUlNU3Lhje9geBdkFn2WXi/ebYfGcp7KYvi8Qdm\n\tHrrskVEjQJcyLnNEw+Hcyie16LGzX5ygBbqxb5Nxulvs6AoqM3yIjN1Ljag2duK67u/O\n\tughJDbUfaB763CnLlb6i1N1+739IYGBLIXpuO6KfsEunue8z5xyJHxSEHYfXciQfznkJ\n\ti6VGWsTEjf86rqGR8UsRlfCYpYuqae1S93oIdZebRARzwEe10XhescIjF1gVCIVxaF3V\n\tqJOz/lNRhRf46yvI7uYyidYlLOzKDHiw+i3etCAZMqQR6SLIm9EaGYsRfO9WrcBWfGyJ\n\tznCg==", "X-Gm-Message-State": "ANoB5pnQ/eDGogHiqhf7ia51yeTprp3N5nHmhWy2OjxWZ+GK+jsJkTZi\n\taVddspFXWYiOxrmcJxxEhHnM4XRWLsTu8Rjk", "X-Google-Smtp-Source": "AA0mqf7VoXjA7ELQ+kjHxzSPtvYVh3yhxVHxKirY5adYql/nUgqh4hSe8hgWvJ8og+yudin9YRQ0mQ==", "X-Received": "by 2002:a05:600c:2284:b0:3d0:837c:8561 with SMTP id\n\t4-20020a05600c228400b003d0837c8561mr14397919wmf.168.1670334906673; \n\tTue, 06 Dec 2022 05:55:06 -0800 (PST)", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 6 Dec 2022 13:54:48 +0000", "Message-Id": "<20221206135459.25521-3-naush@raspberrypi.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20221206135459.25521-1-naush@raspberrypi.com>", "References": "<20221206135459.25521-1-naush@raspberrypi.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 02/13] 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": "<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>", "From": "Naushir Patuck via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Naushir Patuck <naush@raspberrypi.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "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 <naush@raspberrypi.com>\nReviewed-by: David Plowman <david.plowman@raspberrypi.com>\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 <chrono>\n+#include <sys/stat.h>\n #include <sys/sysmacros.h>\n \n #include <libcamera/base/log.h>\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/<subdir>/data/\n+ * directory within the source tree ; otherwise\n+ * - The system data (share/libcamera/pipeline/<subdir>) 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", "v3", "02/13" ] }