From patchwork Fri Mar 31 07:23:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 18497 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 65D66C329C for ; Fri, 31 Mar 2023 07:40:51 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B17ED62750; Fri, 31 Mar 2023 09:40:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1680248449; bh=yXfpIKnj1URDHAgm+r1nqvyD24jjrUtCCqmSkQhTkb4=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=pA6HbC5EoAI2L6wIPaMjRS5i7fioopDWO6Cs3IUTnWpqyRq1H+EvJQhT2aN8opJdJ wM8i3dXMEkjTUNStDGvnF4KDcNH/7GEo5o/vYFalpb896yvooO8GJ+uqdnkoRshBRs VHKjNSn44OY3LY5d6zXLkN4oLakgj1GXaAeJJUWiCPwcnhQEPK25Ll/fZ7i9j2NGii u0pgsRU69QjPWywXENLHsfrywMqxbuwEyprgB3Z69EKrhZdHQbbonuhjKPoPTKOaa5 EZNVhyXC4T0NQghnIDNRE+3TdJt3lpXwtnAITPXio0TQQYbBA8zpIAPClwW4xKWmpn gzNJl1aCpdqHQ== Received: from mail-io1-xd35.google.com (mail-io1-xd35.google.com [IPv6:2607:f8b0:4864:20::d35]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id AB6E9626E3 for ; Fri, 31 Mar 2023 09:40:48 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="GHiiJmci"; dkim-atps=neutral Received: by mail-io1-xd35.google.com with SMTP id e13so9411943ioc.0 for ; Fri, 31 Mar 2023 00:40:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1680248447; 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=r1xDF00lIPNyXEShIbWt3BBCmUdK67y4koidjVf0DD8=; b=GHiiJmciwIfMRTfaCtIYrnCybf46IQmtovsIuf4R+AhRxXbRzbhm1xbuusc3UZeuVn O5kCS5QEwKAJxtbhyDGKRIEKj7EDs3AAPMuTnO3v+YRvxKk7Wh4zPEHeYGPmuGLjWqAL lryDDFgF3r4v4hfD+ji/tQ8QeOzZQ+lBG5kH7qRnub44cW9zXoM8g4yNvy2E6hYoq4sx Me4FtvOqILoCJVwM6qe/PP862Sz6J6xB+4FpvPx48sKiGqeHlUNY6V0x3w14NCf9lrIO SS5IIBcgxuiMCcKHlJ6U4tllqqxMyN/MKQzhVdFZ4WkP4c0z1/8QPIHj3ptXv6iPLFlG 9x2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680248447; 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=r1xDF00lIPNyXEShIbWt3BBCmUdK67y4koidjVf0DD8=; b=75z/ZJv1/89m6S/Z+96mtVhc9/VAk4AG4g/h2UTWiqgOOYX8RpuBAk3Ln4VpVafN+z tD7RUH6OPhlReGL4NArqkGvP8O0pJf6+8dmO8+1nG8DZsihNIM2PnVoF3GpC9cHkUAT8 u1SKbjarFWJCmPwTes5df4NwNAB2Qrqm8baDF/PuXvZfxB83bD8I1cSb8cmtntzOqbTP SDUTaFvHsBf0xXdkrVOqMVc0g/Dilly/ZpkOIe0rS4cOHKbwX9T6qh1LlgJ4ZZFdgLk2 wdQAeA0k0FWCeiEm6KYbCWeVQPBaifAjbN+eQNnCrqSvxzqbBv1b1ACXtMofu8lIPILJ 2Oqw== X-Gm-Message-State: AO0yUKUG17bSSsHLmlXr/6oWhTc3Qx8jArjZTiI2nEBzVu/2lrKHBGPz hXzt5Pxt5b+nnC/bG7RRqz2C4GT27+PYEon29fKWEg== X-Google-Smtp-Source: AK7set9lpzviuVgXZHnVWiK+Dvc7IJrazBarYnRhM8NnFVpP3YHciazlEpFxvsWv/Loc0FT3+N2ooQ== X-Received: by 2002:a6b:6101:0:b0:71b:5cd7:fcd9 with SMTP id v1-20020a6b6101000000b0071b5cd7fcd9mr17957551iob.20.1680248447108; Fri, 31 Mar 2023 00:40:47 -0700 (PDT) Received: from localhost.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id i17-20020a6bf411000000b0074555814e73sm421943iog.32.2023.03.31.00.40.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 00:40:46 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Fri, 31 Mar 2023 08:23:32 +0100 Message-Id: <20230331072341.24851-2-naush@raspberrypi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230331072341.24851-1-naush@raspberrypi.com> References: <20230331072341.24851-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 01/10] ipa: raspberrypi Store the target string in the controller 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 Cc: Jacopo Mondi Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The target string may be used by algorithms to determine the running hardware target. Store the target string provided by the camera tuning files in the controller state. Add a getTarget() member function to retrieve this string. Validate the correct hardware target ("bcm2835") during the IPA initialisation phase. Signed-off-by: Naushir Patuck Reviewed-by: Jacopo Mondi Reviewed-by: Kieran Bingham --- src/ipa/raspberrypi/controller/algorithm.h | 4 ++++ src/ipa/raspberrypi/controller/controller.cpp | 6 ++++++ src/ipa/raspberrypi/controller/controller.h | 4 ++++ src/ipa/raspberrypi/raspberrypi.cpp | 8 ++++++++ 4 files changed, 22 insertions(+) diff --git a/src/ipa/raspberrypi/controller/algorithm.h b/src/ipa/raspberrypi/controller/algorithm.h index 4f3275987305..7c22fbe4945c 100644 --- a/src/ipa/raspberrypi/controller/algorithm.h +++ b/src/ipa/raspberrypi/controller/algorithm.h @@ -41,6 +41,10 @@ public: { return controller_->getGlobalMetadata(); } + const std::string &getTarget() const + { + return controller_->getTarget(); + } private: Controller *controller_; diff --git a/src/ipa/raspberrypi/controller/controller.cpp b/src/ipa/raspberrypi/controller/controller.cpp index e91567852d00..a6250ee140b0 100644 --- a/src/ipa/raspberrypi/controller/controller.cpp +++ b/src/ipa/raspberrypi/controller/controller.cpp @@ -38,6 +38,7 @@ int Controller::read(char const *filename) std::unique_ptr root = YamlParser::parse(file); double version = (*root)["version"].get(1.0); + target_ = (*root)["target"].get("bcm2835"); if (version < 2.0) { LOG(RPiController, Warning) @@ -142,3 +143,8 @@ Algorithm *Controller::getAlgorithm(std::string const &name) const } return nullptr; } + +const std::string &Controller::getTarget() const +{ + return target_; +} diff --git a/src/ipa/raspberrypi/controller/controller.h b/src/ipa/raspberrypi/controller/controller.h index e6c950c3a509..24e02903d438 100644 --- a/src/ipa/raspberrypi/controller/controller.h +++ b/src/ipa/raspberrypi/controller/controller.h @@ -46,6 +46,7 @@ public: void process(StatisticsPtr stats, Metadata *imageMetadata); Metadata &getGlobalMetadata(); Algorithm *getAlgorithm(std::string const &name) const; + const std::string &getTarget() const; protected: int createAlgorithm(const std::string &name, const libcamera::YamlObject ¶ms); @@ -53,6 +54,9 @@ protected: Metadata globalMetadata_; std::vector algorithms_; bool switchModeCalled_; + +private: + std::string target_; }; } /* namespace RPiController */ diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index 66a020d022cd..92c65a2c2f6c 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -266,6 +266,14 @@ int IPARPi::init(const IPASettings &settings, bool lensPresent, IPAInitResult *r return ret; } + const std::string &target = controller_.getTarget(); + if (target != "bcm2835") { + LOG(IPARPI, Error) + << "Tuning data file target returned \"" << target << "\"" + << ", expected \"bcm2835\""; + return -EINVAL; + } + lensPresent_ = lensPresent; controller_.initialise();