From patchwork Fri Oct 6 13:19:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 19110 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 7E093C3273 for ; Fri, 6 Oct 2023 13:20:08 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 20BD562964; Fri, 6 Oct 2023 15:20:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1696598408; bh=j/SW7gNoxKpiRffDpQ3V6c90rH0Ejl1dJ8x3bHYT7p4=; 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=puBGKZeAJpPAtCI7hPKHvzrQhZ0fLVzD9hIR93m6twcf+oX0gFY5iPTvYFiAh1jQF xyDLUDqb7lTX7KbSKJeNWG9e8VxJ5KiyUCNyM2P/+mcMWJqlZ6Ztsf5Iw9yaf9CY1W KEJMokFxIHzlvIOeM2Tjoy9KjaPwQwXSslIQvC8sIVJVkbpbjAyoA+zYaudVsEgFfB o7WafKss7hGhHfEP4tpRksFxSLEdvP+3jCjASBSZ4Ux3r2pI39zn+SyREwOHJcqbw1 WrW8lIuVYiO/Km155zvf10a5HUrxFxw/xHHcsjiDUuOEYUhX68rQpv3XvhiSv+zJVv jGkGCvaUMKr4A== Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 04F0A62964 for ; Fri, 6 Oct 2023 15:20:07 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="C/isIsbd"; dkim-atps=neutral Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3296b87aa13so396958f8f.3 for ; Fri, 06 Oct 2023 06:20:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1696598406; x=1697203206; darn=lists.libcamera.org; 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=AkNVdholsXPriKWLuKJtW86dK6QQTBncTOQiC4z4Br8=; b=C/isIsbdiy/hoOd2E/oDVr88GX6Y2nZe3gGj4UkmAp2pPw2khf/vgy9F8WTXPQl8R2 GA23m0M60jag+ZnPPHK53wDJYbpPKh1ZCn47sTjco8ghktNljKJuTpt7WSm3Z9hqInjw 2ZyiCTELFFzEGd78Y2/pN7lKxBQ5DWbCUc6hKNGkG5RInUCga2llag9C8AYa/d2JXYlO NJGhF4drc3qBqljpQMhN/J95yLV058O++LNSWnkSCIGMlX7+DfJLBPCbkYQZDL/hZjcw LqhhagtXapikzra7A8l3RfR9xP3khwY0+ObKH80CIRKr4QEaUop1wqcn3hZvn+ZiHHj3 dTUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696598406; x=1697203206; 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=AkNVdholsXPriKWLuKJtW86dK6QQTBncTOQiC4z4Br8=; b=qBAl1jy5jeWJlR2ohsXmG2iu/Po5TKwOO28iXX89/CtAe57hrrMAoHDZ8ODEXdjGnZ 9EbP2jN8LyJdgM7RaqgNC1ZW1i6FMaMOkWGyKM69B/LJT1+EjQOInYt1Tw0XpOHZh65t sQ4TuGNaPJEGoXe5o1/1QlgxevE3InbMZir0dByp2f3jGV0/kbNIsQuUd5vXmQXpcy1d eF1U28JGSAAeHvPqc56Ubhr/yUZ26bQLmylI0mBeloyqNJVKe5sUDC27xCE0l6NUv6O8 F1x7uLfFOMjB1wPwy+634TsD0xa3LbVxQZE8r73Sb4YYxeYwGSFeON4yLTUs2mJjmkmp +UZQ== X-Gm-Message-State: AOJu0YzVlVHviPVIBFhrKByGCGKdMb5m1U7qizE7JunqFfjC0H0rfNGW 29T0y1AIPW+IQ2+W9VvZELvPJ0jN9oZaNdctiHtQXg== X-Google-Smtp-Source: AGHT+IH4JjXZge2bjG9GrChSLmLSraioo0o2LzX7iYH4INRMntlW8Z72CClC8b0v2zWySJBahWCQQg== X-Received: by 2002:adf:e6cd:0:b0:31f:a4fa:130a with SMTP id y13-20020adfe6cd000000b0031fa4fa130amr7469923wrm.14.1696598405459; Fri, 06 Oct 2023 06:20:05 -0700 (PDT) Received: from localhost.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id m8-20020a056000180800b00321773bb933sm1639478wrh.77.2023.10.06.06.20.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 06:20:04 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Fri, 6 Oct 2023 14:19:48 +0100 Message-Id: <20231006132000.23504-9-naush@raspberrypi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231006132000.23504-1-naush@raspberrypi.com> References: <20231006132000.23504-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 08/20] ipa: rpi: Add PiSP definitions to the Controller hardware description 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 an entry to Controller::HardwareConfig describing the PiSP hardware for the IPA and controller algorithms to use. Signed-off-by: Naushir Patuck Reviewed-by: David Plowman Reviewed-by: Jacopo Mondi --- src/ipa/rpi/controller/controller.cpp | 15 +++++++++++++++ src/ipa/rpi/controller/controller.h | 1 + 2 files changed, 16 insertions(+) diff --git a/src/ipa/rpi/controller/controller.cpp b/src/ipa/rpi/controller/controller.cpp index 4b6f82b41916..e62becd87e85 100644 --- a/src/ipa/rpi/controller/controller.cpp +++ b/src/ipa/rpi/controller/controller.cpp @@ -31,6 +31,7 @@ static const std::map HardwareConfigMap .agcRegions = { 15 , 1 }, .agcZoneWeights = { 15 , 1 }, .awbRegions = { 16, 12 }, + .cacRegions = { 0, 0 }, .focusRegions = { 4, 3 }, .numHistogramBins = 128, .numGammaPoints = 33, @@ -38,6 +39,20 @@ static const std::map HardwareConfigMap .statsInline = false, } }, + { + "pisp", + { + .agcRegions = { 0, 0 }, + .agcZoneWeights = { 15, 15 }, + .awbRegions = { 32, 32 }, + .cacRegions = { 8, 8 }, + .focusRegions = { 8, 8 }, + .numHistogramBins = 1024, + .numGammaPoints = 64, + .pipelineWidth = 16, + .statsInline = true, + } + }, }; Controller::Controller() diff --git a/src/ipa/rpi/controller/controller.h b/src/ipa/rpi/controller/controller.h index a8bc61880ab4..6e5f595284fd 100644 --- a/src/ipa/rpi/controller/controller.h +++ b/src/ipa/rpi/controller/controller.h @@ -41,6 +41,7 @@ public: libcamera::Size agcRegions; libcamera::Size agcZoneWeights; libcamera::Size awbRegions; + libcamera::Size cacRegions; libcamera::Size focusRegions; unsigned int numHistogramBins; unsigned int numGammaPoints;