From patchwork Tue Nov 17 09:32:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 10441 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 A8509BE082 for ; Tue, 17 Nov 2020 09:32:13 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 740D963324; Tue, 17 Nov 2020 10:32:13 +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="rCue5uOP"; dkim-atps=neutral Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5DB2863282 for ; Tue, 17 Nov 2020 10:32:10 +0100 (CET) Received: by mail-wr1-x433.google.com with SMTP id s8so22423866wrw.10 for ; Tue, 17 Nov 2020 01:32:10 -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=bmC0mbwYqiiIGzWjv5iAkJtHMxxZi2OJ3qCxLRVG2SI=; b=rCue5uOPApeUdO3fBbGZohvgxaD0dJ0Ctz0q+9f/aPqjqC2U8UqBP+ljjulcA6hQan VXnfzhwmS2EWGrVS2wPM5YnYyfwkjT3czHF772xaIWUpU9/xAQV2RAH8Nl3tX+yTkVeP uGLDu5FVXLC/3fsbP2PfvXVyr4II+I9WtthwavACYwf/Lw2aY6tA5yhJIa815TElID1R 0GJaULZ66qQhbxH+zpO2Dx8SUtpY4D3ENty41Mb3SEmsfp05Cm92/DGvujsfA3lrX2um hcIWaGJIXT4U9ZuCYxqlfk4qgvu9xjy36A2jR3lH76/dS5eKU3kCF3QRgWzh7aLyq7FS TEEg== 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=bmC0mbwYqiiIGzWjv5iAkJtHMxxZi2OJ3qCxLRVG2SI=; b=bYSnBygAtevAKvZBwuVjh/+TqGW0W/4fFg4D/eCnQZSfIHU2ZRL+wOkbIH58sBEfzE QI2a9QSimx0o/OfimTAuuCvSmXVT2hkFapPYpud2JOpejRgdAI6OE9N2Ucss0DputkSW I5EURlERmQOMXrNliRsaut1/8xgo/jvDxw0UecgUK7u6ZY2JoAOLLRlbikvRsXnKmYHR BHbNTA2hC9E5m30/iwP0c499aP0K0wFcMtzXEE3hj529Bki/MHPUVjs7DJ25c3qtVAxm 9tPulKUMcNewXVNs3aEdoR6NqqY+3y/ZCkrn0xO2RdCma4/JsvDUUjOSBeoGgvHHJcGQ CA8g== X-Gm-Message-State: AOAM530JbwgRyDHUXfrj/o/dQM28mgLtfpMEJgaFubNARllKxs9PgLSj 9of+GMn5T/LVQ246gpak6ieaF/5WRm2cyA== X-Google-Smtp-Source: ABdhPJyj4jnt/gYEAAcHf59MuvpPvam1CmrqQwUJspMdMXCJIe+lizagpsvhQ3pIaqbdPgGcP0dtZQ== X-Received: by 2002:a5d:6250:: with SMTP id m16mr6708836wrv.400.1605605529815; Tue, 17 Nov 2020 01:32:09 -0800 (PST) Received: from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72]) by smtp.gmail.com with ESMTPSA id c62sm2666966wme.22.2020.11.17.01.32.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 01:32:09 -0800 (PST) From: David Plowman To: libcamera-devel@lists.libcamera.org Date: Tue, 17 Nov 2020 09:32:04 +0000 Message-Id: <20201117093205.9521-2-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201117093205.9521-1-david.plowman@raspberrypi.com> References: <20201117093205.9521-1-david.plowman@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 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" This had just been forgotten. 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 Tue Nov 17 09:32:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 10442 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 5056EBE082 for ; Tue, 17 Nov 2020 09:32:14 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C0BBD63329; Tue, 17 Nov 2020 10:32:13 +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="XSgrmJpW"; dkim-atps=neutral Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3DCBC63282 for ; Tue, 17 Nov 2020 10:32:11 +0100 (CET) Received: by mail-wr1-x433.google.com with SMTP id o15so22447805wru.6 for ; Tue, 17 Nov 2020 01:32:11 -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=6MHsSTwps/fXcvuXbZNYjauR7mMiCJ60NlJ3/zhDPIg=; b=XSgrmJpWyfzogRHT42jtp/Fwe2BIm0Pq1bmQs2khOKpw3FY1cIN2vETj2wPMwZig6d vMakKgOcPJdM4+V8l0Pq4KIKuCsBt/FMu+ACJPPuo3QQ+0XuuHc6DzgFjYuu5rGXRlHy SSZPEsDWM3EhVNF6dK3NP6d2cpooPBo/sDCjei4QbGp39LiwtKrXYc9B2xnSeBR7DJmU glrkIa+ppcVo4skKIPnmG+POPckZwCM7S1u+WQZiVzlIZwbUzY04ju7G0aDnEPTQQlsh 2VZHraB8fNBvO3SNbxKDwOB0eBI2J0/tJiuLFK8D2TpbwykC5IoKWm3VIFeU8izd9+8+ nHfQ== 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=6MHsSTwps/fXcvuXbZNYjauR7mMiCJ60NlJ3/zhDPIg=; b=S0OHdTGOZO6SmzK9P4IAAaRQU35eONfj6EafxLg23N1Ab77jqzFRo61W0Se+wfHso1 qtsKkYgrX2ViP3oznSsFLxcbTwqD520epSapEIo7uYsf8ubJ/P5uW71gfIjijGEY0Pcf K1czQHhg0VNQ7Yvw5dpWwgbNBOCb5kkG2PEKfI013rA/2OlFeQe8p86hazVNugPNJ0lI f8sGVocBnqr5UlVgEYELWM1ZBnSpreDxfEVQPusHXrnA5ZmjjBKP1FeL6JqgxFkZTx0w cZrWzOmOuxV4YuZydi4jhVfMpKEd6+1tV20upqdzlvan82R+F7KYlLU6THXcUm8Qe+wS J8zQ== X-Gm-Message-State: AOAM531wfmqQd5eU4B9/QSJZ3K6HuITek/cuMFo2MXllOA6l2I1HAUQ5 bsH+iTXV2MKi7EJVi4L9tXfYhSRvvzNKrw== X-Google-Smtp-Source: ABdhPJxRSwzl8ytlMD0hc+LKVE/bf6MUat6Iz8gWJy57CVmtA3+/yor7hp49kvUH100ngrBX6XPYmw== X-Received: by 2002:adf:f183:: with SMTP id h3mr24736264wro.239.1605605530715; Tue, 17 Nov 2020 01:32:10 -0800 (PST) Received: from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72]) by smtp.gmail.com with ESMTPSA id c62sm2666966wme.22.2020.11.17.01.32.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 01:32:10 -0800 (PST) From: David Plowman To: libcamera-devel@lists.libcamera.org Date: Tue, 17 Nov 2020 09:32:05 +0000 Message-Id: <20201117093205.9521-3-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201117093205.9521-1-david.plowman@raspberrypi.com> References: <20201117093205.9521-1-david.plowman@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 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. I've chosen to go with the libcamera terminology (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] }