From patchwork Fri Jan 27 15:43:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 18202 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id DFA2DBDC71 for ; Fri, 27 Jan 2023 15:43:42 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D459F625EE; Fri, 27 Jan 2023 16:43:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1674834219; bh=MfmJvw88lgHQVnelEqUJ4gx08aFdQMY340f3rWJzFOs=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=Yp6HxVVrNrnTVY/pL4o7+Q6kk2QjBR/pvMl/on0S8Jn7QxRVxyMU0uIPhdGCnWwBh ITV89XcvwlR/DvwSgepNWHL/qo4HS1fPbcaH7MR5tHOxPzwPWumF9LeNOTFSip4AJa /heU/bUYt8g6r+N/vBSqwYm4bFELw/UsNfX22OXh0ymgI+o8EecnsLjB7XP5aW1GPq Dvjrk4digzmKAfL1s+4TtGXa+bGdHiHoJdlge7EZRuhrxjs047D0hVOe50DHiHxCK0 qO+RrGJYLx6VS1NC5h4xFgB4ahHcZ1gmn2mnXmN1UWbw5Atsk4bai+ucwl/J4bpNVT jR8qV+QxGWA+A== Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3FFD961EFA for ; Fri, 27 Jan 2023 16:43:37 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="S4iRAzH3"; dkim-atps=neutral Received: by mail-wm1-x336.google.com with SMTP id k16so3747561wms.2 for ; Fri, 27 Jan 2023 07:43:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qg+Vovpm8IQXQFF1XiND9m99lJ0nfk2ofAAVcmswMfM=; b=S4iRAzH3jrPcocHmUeObkuojnJPeXPAesDgmyAJcfXmzFa2NyI6WqkyhRPrx6DaIT0 aVHCMgqt+apB34+NJpjCdS6kQICSzCfN1STprTMfxnKc2l6rWCWfiPB2jQtjQ0gawpvb x94YKvxS2XxvQ+tM8fGlJnjarChXBsD4zvdVGosa3h2eDxMkrcSgN0+FscGYFSjjMQql b5RbOBDiiUNwhII/NOEi4ktr/teXPm5wcgwZXzPaELyGL8C7yWFEvOlq5ziPQW24KmVO K7OwfReTM+qRU/dfXQtuO0ur3E1yuwtxgb/cqCM44jaA+zsdr/UNN5Mh5UaFfsBazyQh as8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qg+Vovpm8IQXQFF1XiND9m99lJ0nfk2ofAAVcmswMfM=; b=B8V1VoxVIyYipowBX47czGmi5vXZncui1NAVpTq79lfKl7jHD80qNz9A9otjzsfHN/ +bQpgcmu8eN3bM0rL0+qB8E1To9nL3LSkoXkNI3v3tT5/QBTsLMVME6tJBljy05srvvb 25KMaytm+0w5dTHD8UzJ0DGYQLUB3SgKTuC1mJWRk8kruCToim+SfYHqBROygCQSPT4P IVUiwQsLQEtmn5U0CXusxhwmW1WopoJzLz/avynKh77JeUabNqbC+z+B/tNZq5Pa+qR3 3sbifid+zLMfBH9RFd9nTwHtXOT7GpNqB4W6LA02caVG40JqXLuWTHvqlNvp8ZAnz8G+ hjHg== X-Gm-Message-State: AFqh2kqTKKP0r0OhCGtS2DA0tU9A9tO2hFmtDqWpMBTOmqBBrf/Zd1ir AyQsTvRBtb7slUDHh4P4h1n8jbI0ryYAByP6i3U= X-Google-Smtp-Source: AMrXdXsspt+LX0+VLrE0D9IbxQ04g+PsqmFsUNxwecF8uxY6LH8Py9dXjLvMCU5weFTrGSyNjZ0pDg== X-Received: by 2002:a05:600c:3412:b0:3d6:e790:c9a0 with SMTP id y18-20020a05600c341200b003d6e790c9a0mr41633639wmp.10.1674834216641; Fri, 27 Jan 2023 07:43:36 -0800 (PST) Received: from localhost.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id h18-20020a05600c30d200b003c21ba7d7d6sm4549566wmn.44.2023.01.27.07.43.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 07:43:36 -0800 (PST) To: libcamera-devel@lists.libcamera.org Date: Fri, 27 Jan 2023 15:43:09 +0000 Message-Id: <20230127154322.29019-3-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230127154322.29019-1-naush@raspberrypi.com> References: <20230127154322.29019-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v6 02/15] libcamera: pipeline: Add a platform configuration file helper X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Naushir Patuck via libcamera-devel From: Naushir Patuck Reply-To: Naushir Patuck Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add a new helper function PipelineHandler::configurationFile() that returns the full path of a named configuration file. This configuration file may be read by pipeline handlers for platform specific configuration parameters on initialisation. The mechanism for searching for the configuration file is similar to the IPA configuration file: - In the source tree if libcamera is not installed - Otherwise in standard system locations (etc and share directories). When stored in the source tree, configuration files shall be located in a 'data' subdirectory of their respective pipeline handler directory. Signed-off-by: Naushir Patuck Reviewed-by: David Plowman Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- include/libcamera/internal/pipeline_handler.h | 3 + src/libcamera/pipeline_handler.cpp | 57 +++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h index ec4f662d7399..4c4dfe62a680 100644 --- a/include/libcamera/internal/pipeline_handler.h +++ b/include/libcamera/internal/pipeline_handler.h @@ -65,6 +65,9 @@ public: bool completeBuffer(Request *request, FrameBuffer *buffer); void completeRequest(Request *request); + std::string configurationFile(const std::string &subdir, + const std::string &name) const; + const char *name() const { return name_; } protected: diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp index cfade4908118..f72613b8e515 100644 --- a/src/libcamera/pipeline_handler.cpp +++ b/src/libcamera/pipeline_handler.cpp @@ -8,6 +8,7 @@ #include "libcamera/internal/pipeline_handler.h" #include +#include #include #include @@ -534,6 +535,62 @@ void PipelineHandler::completeRequest(Request *request) } } +/** + * \brief Retrieve the absolute path to a platform configuration file + * \param[in] subdir The pipeline handler specific subdirectory name + * \param[in] name The configuration file name + * + * This function locates a named platform configuration file and returns + * its absolute path to the pipeline handler. It searches the following + * directories, in order: + * + * - If libcamera is not installed, the src/libcamera/pipeline/\/data/ + * directory within the source tree ; otherwise + * - The system data (share/libcamera/pipeline/\) directory. + * + * The system directories are not searched if libcamera is not installed. + * + * \return The full path to the pipeline handler configuration file, or an empty + * string if no configuration file can be found + */ +std::string PipelineHandler::configurationFile(const std::string &subdir, + const std::string &name) const +{ + std::string confPath; + struct stat statbuf; + int ret; + + std::string root = utils::libcameraSourcePath(); + if (!root.empty()) { + /* + * When libcamera is used before it is installed, load + * configuration files from the source directory. The + * configuration files are then located in the 'data' + * subdirectory of the corresponding pipeline handler. + */ + std::string confDir = root + "src/libcamera/pipeline/"; + confPath = confDir + subdir + "/data/" + name; + + LOG(Pipeline, Info) + << "libcamera is not installed. Loading platform configuration file from '" + << confPath << "'"; + } else { + /* Else look in the system locations. */ + confPath = std::string(LIBCAMERA_DATA_DIR) + + "/pipeline/" + subdir + '/' + name; + } + + ret = stat(confPath.c_str(), &statbuf); + if (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG) + return confPath; + + LOG(Pipeline, Error) + << "Configuration file '" << confPath + << "' not found for pipeline handler '" << PipelineHandler::name() << "'"; + + return std::string(); +} + /** * \brief Register a camera to the camera manager and pipeline handler * \param[in] camera The camera to be added