From patchwork Mon Sep 26 12:29:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 17407 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 66C97BD16B for ; Mon, 26 Sep 2022 12:29:26 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1356F62266; Mon, 26 Sep 2022 14:29:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1664195366; bh=/W+6w22mwo/UbUeLx2OiB9XQvA7QNLWp3TyyjuUiy9E=; 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=yuTqvLtwyvbd5Fc0WIBxoZD/hoNwr+aD6jq1W9MZy1blqaQmuzjD8Fc9aMp1XS6t6 XLIwAiBxJwGTC9xrcSXnQCADKLkDiZSdWsfR0ZjtadTrTWh5b+wFrr+kTU3tlwSCdr sOJCJ+gxqDU+vZ8+r4tvkn3RakHGJqYmiJC64ty/OYkzDfojMmapSh+c5XiXB2BCEy 2AVRcQ1lSlyVFkWZasBrdvSNYsokcsv1r/+feuRqUlrUuEBKWWXvjqgWml1I6nxKqX PljOZFEtoAiniySyPSUKNuWlPpYrMj8x2RmW5Kf215BC+Q+xfkzq4JY19i05FSXJoF OV+wNCcSMb6gQ== Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 24A126225F for ; Mon, 26 Sep 2022 14:29:22 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="W6NtRKYT"; dkim-atps=neutral Received: by mail-wr1-x42d.google.com with SMTP id cc5so9975798wrb.6 for ; Mon, 26 Sep 2022 05:29:22 -0700 (PDT) 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; bh=lk4xKf8q+Qd6eW3jkL4LSWFq+x5ua71EkVwKLtYfjmg=; b=W6NtRKYTbOEIkDsg9kShavtE1LntET6KRfqqDGrOC+Y7wXJaCq5vYA1ayOSirhk5VE ulBFDfzm/bb5dZSw1BDuxlRS3AuRWfy70WPOgjjpZRv8vlpdemAci0g/kYrpJdc3Gqb2 JY3KWC3HdGeOseOhZjkKbowMwI6Xwv7ePDc06mo72vwmFk3ezMmrOQLMG258GfYs/29y ZpRCmcgTh4XNUTHTLJaOVXWYJkQ5HTVOoAW2xGupIWdYvzhQOgPkEbjRZ8v9xye6L939 YO3w5ssmAaNLZ8H0TI2ilcX24aXeOFxRR6MuGIUH3pSzekkLFITUxEQuIKDF2vvZl5JB 1+bQ== 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; bh=lk4xKf8q+Qd6eW3jkL4LSWFq+x5ua71EkVwKLtYfjmg=; b=M6zxsVUT5fQMS9MrxQuIHdCOfYe8kh802b1rhNklmWEk1yxSuwLjptDOdyqrKbJkL0 MdriqYlf9PmVyWDbJ7b792pslVfNtB/UxcHWtHbOCApn3oEVmYGP7LsvnsdFCVWE3Yxm xHjoFiwIgXVASzYnx0OGZLXyNT9oKo55CE1ILQ2qSTObdjHUMSdORGO+jpjtbiBjgEJK A1B5JunqeDq2Jggv6KluhZEFfgKEkyXctw4ZAuqxOMB9RSqlT6xnBwiuHDi9qWzBHcmM S2fovIYsDkm6f4pBIyPmcKSXtFCRTPJ6J9uZmiKo5y7dfbB+wDZWYQ4X9ZiEiXSZptYh 6LqQ== X-Gm-Message-State: ACrzQf2mTSi1lr/K+/aYKfX+kewB2L4ptACKI4X2QiMuQiV91p4GxmYC ns0JI/aAlcTIo1EJRaIkq9y8THD0+RuIB7wn X-Google-Smtp-Source: AMsMyM6tOlzkXbay2n4KkhHxbk9Q/340Hf4c7lTGg2nZuehP3WHRE38B+FZL8kPF2HFFpUKxdqWqoQ== X-Received: by 2002:adf:ecd2:0:b0:228:6439:a24 with SMTP id s18-20020adfecd2000000b0022864390a24mr13271914wro.401.1664195361168; Mon, 26 Sep 2022 05:29:21 -0700 (PDT) Received: from naush-laptop.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id i24-20020a1c5418000000b003a601a1c2f7sm11243700wmb.19.2022.09.26.05.29.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 05:29:20 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Mon, 26 Sep 2022 13:29:09 +0100 Message-Id: <20220926122911.13412-3-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220926122911.13412-1-naush@raspberrypi.com> References: <20220926122911.13412-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v1 2/4] pipeline: raspberrypi: Update naming convention for tuning files 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" Append "_mono" to the sensor name when generating the tuning filename for monochrome sensor variants. So the new naming convention is as follows: .json - Standard colour sensor variant _mono.json - Monochrom sensor variant Rename the existing imx296.json file to imx296_mono.json as this tuning file is based on the monochrome variant of the IMX296. Signed-off-by: Naushir Patuck --- .../data/{imx296.json => imx296_mono.json} | 0 src/ipa/raspberrypi/data/meson.build | 2 +- .../pipeline/raspberrypi/raspberrypi.cpp | 19 +++++++++++++++---- 3 files changed, 16 insertions(+), 5 deletions(-) rename src/ipa/raspberrypi/data/{imx296.json => imx296_mono.json} (100%) diff --git a/src/ipa/raspberrypi/data/imx296.json b/src/ipa/raspberrypi/data/imx296_mono.json similarity index 100% rename from src/ipa/raspberrypi/data/imx296.json rename to src/ipa/raspberrypi/data/imx296_mono.json diff --git a/src/ipa/raspberrypi/data/meson.build b/src/ipa/raspberrypi/data/meson.build index 211811cfa915..465a7a17ce6f 100644 --- a/src/ipa/raspberrypi/data/meson.build +++ b/src/ipa/raspberrypi/data/meson.build @@ -4,7 +4,7 @@ conf_files = files([ 'imx219.json', 'imx219_noir.json', 'imx290.json', - 'imx296.json', + 'imx296_mono.json', 'imx378.json', 'imx477.json', 'imx477_noir.json', diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index dcd81650c32d..c068b07b31fe 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -67,6 +67,14 @@ SensorFormats populateSensorFormats(std::unique_ptr &sensor) return formats; } +bool isMonoSensor(std::unique_ptr &sensor) +{ + unsigned int mbusCode = sensor->mbusCodes()[0]; + BayerFormat bayer = BayerFormat::fromMbusCode(mbusCode); + + return bayer.order == BayerFormat::Order::MONO; +} + PixelFormat mbusCodeToPixelFormat(unsigned int mbus_code, BayerFormat::Packing packingReq) { @@ -1551,10 +1559,13 @@ int RPiCameraData::loadIPA(ipa::RPi::IPAInitResult *result) */ std::string configurationFile; char const *configFromEnv = utils::secure_getenv("LIBCAMERA_RPI_TUNING_FILE"); - if (!configFromEnv || *configFromEnv == '\0') - configurationFile = ipa_->configurationFile(sensor_->model() + ".json"); - else - configurationFile = std::string(configFromEnv); + std::string sensorStr = sensor_->model(); + if (!configFromEnv || *configFromEnv == '\0') { + if (isMonoSensor(sensor_)) + configurationFile += "_mono"; + configurationFile = ipa_->configurationFile(sensorStr + ".json"); + } else + configurationFile = sensorStr; IPASettings settings(configurationFile, sensor_->model());