From patchwork Fri Nov 20 11:16:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 10453 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 530D5BE176 for ; Fri, 20 Nov 2020 11:16:27 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 248A56159D; Fri, 20 Nov 2020 12:16:27 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="nwFnzANp"; dkim-atps=neutral Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A80316159D for ; Fri, 20 Nov 2020 12:16:23 +0100 (CET) Received: by mail-wm1-x32f.google.com with SMTP id c9so10002373wml.5 for ; Fri, 20 Nov 2020 03:16:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mZdhtfMQooRx55G1kMiuiEggGn8JP9tVPu32S4SIZJg=; b=nwFnzANpO+WUF5d0fikEwi/0Eeaaa8UfD9mkPx+QW5CNy2BUcdkwR1wrimkzXAZdtB iVPLdy0TrWL0spr5P1GufWfOPePeorh+0UVgbw0WDm9ZCB5+IADT3Rw1c7dXmvLzOJs/ gC0lVGPGB5HKy/lKbPNxtuRv8X6BWO/70hZmQ5y5d2Ec45yLvMxW1bE/lmZBW493mLsD Q2/JVDaSw3Xv137eul8cO6ENN3MQk5FnWnRZza/FvJ7BGjB+Joz/T06OZ7I58ctI8qhS 5jvpG3xQwAqKEkBhhPbT0toQEtmYp+rr3xzGlyrqhgAWECmkqjCpQJrC4S08DK/XETNS Ussw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mZdhtfMQooRx55G1kMiuiEggGn8JP9tVPu32S4SIZJg=; b=Crs6E3Ei7B3h9vvPG3yQaK8MFqAtbyCIL8/+zhMiyBjNGr37xZBPcH+dncJH2oOTMN xtJixZH3iuFn3lJs2hQ4kIBuxVo0VIn7jTvhdxLFH/WttjNO5vXt0p1kUFACLLrRi0Dq 98vlXgjhNBkGxobXAfD4N3HHtp3ezQDrVqoJ2ncmeFPb7wjNKIm/fEg67MxhOw3D4B43 yhTINiFeAvrS4X53YWXebVPY9StyLFBzTkIBjfh8dLjnMl3oB5viuCMbwJHDXa0XJm8d /eNvE6zXpoIN8KqTS9hws2zb6LuEYH8d2E/G5HJrd226ToG08i8iugfRCB0m7Yp2YSCi gtvA== X-Gm-Message-State: AOAM531SwJapNV345Tw0FSAucRs+3B0mndhqKppSjmlY4ULl+iiRMxLQ gzVMEgMOqkbsuUyvI1QFH/oCg46BM43nnw== X-Google-Smtp-Source: ABdhPJx+21nKmVg7DPl3M2pDdCM+0Ks4buAov4gcknrpYENn2Q7wVarhUr3pS7IT9A/tSL9E/bA6yQ== X-Received: by 2002:a1c:a344:: with SMTP id m65mr9576195wme.77.1605870983214; Fri, 20 Nov 2020 03:16:23 -0800 (PST) Received: from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72]) by smtp.gmail.com with ESMTPSA id j127sm4249805wma.31.2020.11.20.03.16.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Nov 2020 03:16:22 -0800 (PST) From: David Plowman To: libcamera-devel@lists.libcamera.org Date: Fri, 20 Nov 2020 11:16:17 +0000 Message-Id: <20201120111618.15449-2-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201120111618.15449-1-david.plowman@raspberrypi.com> References: <20201120111618.15449-1-david.plowman@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 1/2] src: ipa: raspberrypi: Add missing 'cloudly' AWB mode 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Support the 'cloudy' AWB mode which was left out when the AwbModeTable was introduced. Signed-off-by: David Plowman Reviewed-by: Naushir Patuck Reviewed-by: Kieran Bingham --- src/ipa/raspberrypi/raspberrypi.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index 4632d764..9853a343 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -477,6 +477,7 @@ static const std::map AwbModeTable = { { controls::AwbFluorescent, "fluorescent" }, { controls::AwbIndoor, "indoor" }, { controls::AwbDaylight, "daylight" }, + { controls::AwbCloudy, "cloudy" }, { controls::AwbCustom, "custom" }, }; From patchwork Fri Nov 20 11:16:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 10454 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 D7994BE176 for ; Fri, 20 Nov 2020 11:16:27 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 78AAC615BA; Fri, 20 Nov 2020 12:16:27 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="DuTDrFN8"; dkim-atps=neutral Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CF1D661564 for ; Fri, 20 Nov 2020 12:16:24 +0100 (CET) Received: by mail-wm1-x335.google.com with SMTP id s13so9461917wmh.4 for ; Fri, 20 Nov 2020 03:16:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ScTxAk2XTU9v/GfpkgrLqLe0zx+rvFymh1hyQh3pJuc=; b=DuTDrFN8txuDM7TWphNJKJLdIKR7MCm4kRWrLqqCU7Ey1kyqdea70xyrV90N6h+eHs hU86ENEQoK4e1OKdhZw77+4+gVHFaQVQy5sUvNKz+AIcefVlu9kfH8XvsXEP8s/ikOVM 0oEATlJsIopDKvROqre28n1HVlbIpdodyQHGA5KM/qekNsGxlDud2e131bAuyCi7nymZ hHGoE8oxfyEapYjY1ESnfF/IfJxbV8Dsc/Ax9Eb/Plb6bA+uqUbMbE+waan9Fs9klD8F y9p4HoQBn/LyXTHkJTgico4gx1gySx5AdIgSzzMOPNZ/b6HGg9N+bfDPtnf8f82jmR/v 4urA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ScTxAk2XTU9v/GfpkgrLqLe0zx+rvFymh1hyQh3pJuc=; b=ZNsnk3pa/lzcyTvSolhWHK6m8VFGHrH4vitvyarmbTkzFV4EWK3V1DM18cY7+KTRwV MEeJ1Klt5i5MW/6HZ1rbIUjqfcjOp9cYTlEavVH6GnF6kcBgH/CzBFMXEWwxEQYdV4uS Kz8KYugh1Ny6vU+55v7rUpll3WkfescH4z8/Fm3JTmTuyGh2SZzKoeald/3FN2cKSmxb cvD4PwwJcC0D2MrCYij5xTmzGqDQdRNeNRSKRI7zACkJPBgysv4xTbCtq1oH+MxC3RkF GIJgshgzljMqbQnOFKC4QwRgCN1H+65IKDbiIyUWOd+8MI/kF0b8fAj0v9h/da0NQaeY WocQ== X-Gm-Message-State: AOAM531TbNt977bHSStCUBzHuOyq9hysaqsAg0ALNtrw5dOIl7w+ylsj KJoGkgktZ0r7Zyz10S58WvE1abC0CKQVEQ== X-Google-Smtp-Source: ABdhPJyQ0byQK3vaARwkP7W2Fjpa6leZbbqRMZDNDvq/Vc3NXSjqpNQEe0qbVyWu4xiqtGbeJoJmPw== X-Received: by 2002:a1c:e206:: with SMTP id z6mr1791162wmg.49.1605870984317; Fri, 20 Nov 2020 03:16:24 -0800 (PST) Received: from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72]) by smtp.gmail.com with ESMTPSA id j127sm4249805wma.31.2020.11.20.03.16.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Nov 2020 03:16:23 -0800 (PST) From: David Plowman To: libcamera-devel@lists.libcamera.org Date: Fri, 20 Nov 2020 11:16:18 +0000 Message-Id: <20201120111618.15449-3-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201120111618.15449-1-david.plowman@raspberrypi.com> References: <20201120111618.15449-1-david.plowman@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 2/2] src: ipa: raspberrypi: Change 'sport' exposure mode name to 'short' 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The names have to match for the setting to work. Use the libcamera terminology for consistency (even though it touches more files). Signed-off-by: David Plowman Reviewed-by: Naushir Patuck Reviewed-by: Kieran Bingham --- src/ipa/raspberrypi/data/imx219.json | 2 +- src/ipa/raspberrypi/data/imx477.json | 2 +- src/ipa/raspberrypi/data/ov5647.json | 2 +- utils/raspberrypi/ctt/ctt.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ipa/raspberrypi/data/imx219.json b/src/ipa/raspberrypi/data/imx219.json index ce7ff36f..b03a7beb 100644 --- a/src/ipa/raspberrypi/data/imx219.json +++ b/src/ipa/raspberrypi/data/imx219.json @@ -140,7 +140,7 @@ 1.0, 2.0, 4.0, 6.0, 6.0 ] }, - "sport": + "short": { "shutter": [ diff --git a/src/ipa/raspberrypi/data/imx477.json b/src/ipa/raspberrypi/data/imx477.json index 73ad1ae9..12fe2f41 100644 --- a/src/ipa/raspberrypi/data/imx477.json +++ b/src/ipa/raspberrypi/data/imx477.json @@ -140,7 +140,7 @@ 1.0, 2.0, 4.0, 6.0, 6.0 ] }, - "sport": + "short": { "shutter": [ diff --git a/src/ipa/raspberrypi/data/ov5647.json b/src/ipa/raspberrypi/data/ov5647.json index a2469059..3d8a7c8f 100644 --- a/src/ipa/raspberrypi/data/ov5647.json +++ b/src/ipa/raspberrypi/data/ov5647.json @@ -140,7 +140,7 @@ 1.0, 2.0, 4.0, 6.0, 6.0 ] }, - "sport": + "short": { "shutter": [ diff --git a/utils/raspberrypi/ctt/ctt.py b/utils/raspberrypi/ctt/ctt.py index 30d35ae4..15064634 100755 --- a/utils/raspberrypi/ctt/ctt.py +++ b/utils/raspberrypi/ctt/ctt.py @@ -130,7 +130,7 @@ class Camera: "shutter": [100, 10000, 30000, 60000, 120000], "gain": [1.0, 2.0, 4.0, 6.0, 6.0] }, - "sport": { + "short": { "shutter": [100, 5000, 10000, 20000, 120000], "gain": [1.0, 2.0, 4.0, 6.0, 6.0] }