Patch Detail
Show a patch.
GET /api/patches/17908/?format=api
{ "id": 17908, "url": "https://patchwork.libcamera.org/api/patches/17908/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17908/", "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": "<20221129134534.2933-2-naush@raspberrypi.com>", "date": "2022-11-29T13:45:25", "name": "[libcamera-devel,v2,01/10] libcamera: pipeline: Add a platform configuration file helper", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "1cbf916e246603c3d22d62f750a6d22d428de8d2", "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/17908/mbox/", "series": [ { "id": 3647, "url": "https://patchwork.libcamera.org/api/series/3647/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3647", "date": "2022-11-29T13:45:24", "name": "Raspberry Pi: Platform configuration and buffer allocation improvements", "version": 2, "mbox": "https://patchwork.libcamera.org/series/3647/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17908/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17908/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 3F5A9BE08B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 29 Nov 2022 13:45:42 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 37F296333E;\n\tTue, 29 Nov 2022 14:45:40 +0100 (CET)", "from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com\n\t[IPv6:2a00:1450:4864:20::32e])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F35A863331\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 29 Nov 2022 14:45:38 +0100 (CET)", "by mail-wm1-x32e.google.com with SMTP id 5so10931800wmo.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 29 Nov 2022 05:45:38 -0800 (PST)", "from naush-laptop.localdomain ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\tn8-20020a05600c3b8800b003cfbbd54178sm3565636wms.2.2022.11.29.05.45.37\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 29 Nov 2022 05:45:37 -0800 (PST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1669729540;\n\tbh=sEBfzHnphfZAo4fHYpOPsUdpXVpRV0xOAvTaMkFcF/E=;\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=TJejGBUBKtzWH14+2e/spCCnJxG/7F853a4Gwb3KRF+Y1X16GL/SsMn0tkv0FdVSZ\n\t2rCiRvwaGnWPLCt+dTr06iL3/a0tqDQ9cpaOh1TcLlLo2KhKTzTEYN1J6goMwhmu1x\n\tEfCER+z8iHq1Nrbuv0QPNnaCW7gqmDLgmJJXqpsKiI/o2mHcYJXaTwn3KjPh60PBoJ\n\tMjZ8X/5xVsFKg2MEQ+JiKr24F9qH89AoBK2KkDlc2/R+A2R7++q4azPlF+znBhzEOW\n\tLUpVLWCYJDjl7fNz5TIwcRXgftQndvO6N5pyz5CYIxb8Dc1NDqqun2hQCsKefZ4Wmw\n\tkeoGde0jnHItw==", "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=juEPIBZJVl2IlKL+jRo+h/Z5jZ0Qb5/58kfmj36PGFs=;\n\tb=CeGxy6sk4CS14gmqzUlAov5/Yc0UvR1U9rmdExWhs/FyD615T++r9LlIL4Faeb74bh\n\t5GweChlosWGmcUXJPUwbo/znfkHBgoM1QA6USwVYGnG0SDqRYYPHRIhr9uXKIDHcIG30\n\tJzaNd8dsc6RcFttdeNq7sIGtgIz4XvTZI1LojSRvfZrq3PSlDRVjBpI4/emcz5mt0zuc\n\tElxUu2iEVZAJudVbWIpbNnYavn0VUgB1ft3tAr8P5ZMV1OpzI2Ma+wrmkYl+Lo+F5Lff\n\tqt9S6RZFaCoiMYFSvKrGAXdN6p8BKTGkme9dKt9Gge5aPPDGSdQseO1mMMQEkSAVUKzE\n\tsJXw==" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"CeGxy6sk\"; 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=juEPIBZJVl2IlKL+jRo+h/Z5jZ0Qb5/58kfmj36PGFs=;\n\tb=EatBzoUVLVQfDZMREs38efZ47TqHW4gSZM1bitF1s320J/CDD2kVIsVTOx8KFRzoK6\n\tJ1QOkhC12UWGfsPrRA4+fwwB6YNofo7QngPZruDzLrhhRVUYZyx7OjSHczv0dfoyvTIb\n\twDpsYpb0XqUbJcVLRnTehb4PZo68DxJMyhEH7rvzUJKE0jGfPP7Iikp9nScfm/vP7kbm\n\tb3z7qC/3Y56/NNj9NPSYWO2pN2FJ2dDzyU1LnDwRSMBoEW7HTNkau8Z0S5So5pKT8v0r\n\trWptTczRx/8ABO/OJxW66BudB5qviOzVOU77sI1E1waB44gAHx4eCiI+L6+y2iMWcIaQ\n\t/R1Q==", "X-Gm-Message-State": "ANoB5pme1iNZ/bCzxEi9DgUwDqG1XyqSQ/pZ8oUloEixqcVJJzIZh7H5\n\ttcNycEWdVx7xJcuDXkLKGugs/rF8LyV3pw==", "X-Google-Smtp-Source": "AA0mqf7jC0eBG+7BoD4kp8j8AsmJDY/mC367rFMYTl2NnunG4ktbUPcaCUMbPmEnQfs2RyZvfigtwg==", "X-Received": "by 2002:a05:600c:4e06:b0:3cf:703e:1d88 with SMTP id\n\tb6-20020a05600c4e0600b003cf703e1d88mr29731194wmq.155.1669729538330; \n\tTue, 29 Nov 2022 05:45:38 -0800 (PST)", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 29 Nov 2022 13:45:25 +0000", "Message-Id": "<20221129134534.2933-2-naush@raspberrypi.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20221129134534.2933-1-naush@raspberrypi.com>", "References": "<20221129134534.2933-1-naush@raspberrypi.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 01/10] 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..cd27bcf944d6 100644\n--- a/include/libcamera/internal/pipeline_handler.h\n+++ b/include/libcamera/internal/pipeline_handler.h\n@@ -76,6 +76,9 @@ protected:\n \n \tvirtual void releaseDevice(Camera *camera);\n \n+\tstd::string configurationFile(const std::string &subdir,\n+\t\t\t\t const std::string &name) const;\n+\n \tCameraManager *manager_;\n \n private:\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex cfade4908118..b4579671ba5a 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@@ -638,6 +639,65 @@ void PipelineHandler::disconnect()\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 * \\var PipelineHandler::manager_\n * \\brief The Camera manager associated with the pipeline handler\n", "prefixes": [ "libcamera-devel", "v2", "01/10" ] }