From patchwork Fri Oct 13 07:48:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 19132 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 EE35CC32BB for ; Fri, 13 Oct 2023 07:48:59 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7A5156299C; Fri, 13 Oct 2023 09:48:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1697183339; bh=grKRcMsPLPTDt0zCnVGMPYfcCnn0WLFzYyoDqxEwl0Q=; 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=j40VU/MqpL/vR4a/fmDWchTTvLrloA19H8zaUhzs0thK4cUA+3dMFyULQD3x74lgt iVxNptZfPyvpTbFJdye2dUBFLztAD9xR0oH/Plj0pXfL2nNfV5vBGhBXlp3llZF8RZ v8kiShAn562Oqgj4flp3r/kUzRfjnEjJ6f7s+0NDxtpmdieQaUYgvHyUOHY1Y0+yu/ S58Uhc9LWARF/J/sea5ynJ61B/Mfbj4hOc01CGx15V39UsWYD972/01aIKJsHDI1EW qjiHj2bVRkOqKUCVpwUS3Nfei9CVfTHtEoP8NXAA02Y6XijlTEQVQXmLYFhqf90ilm c++IbF3WfyEfA== Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E03B962988 for ; Fri, 13 Oct 2023 09:48:52 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="e73sxPBg"; dkim-atps=neutral Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-5230a22cfd1so3186277a12.1 for ; Fri, 13 Oct 2023 00:48:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1697183332; x=1697788132; 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=dszJkstXMUB4hIMHgiMs+n0waKBu2LYR6hRex+ii310=; b=e73sxPBgX8BRiNDvmJ9usYadvktbNvSzZtKbPnq3viRPUGz5w93gliFkQXUKtJISRe eiKE322XsESeOO42405lEZ4+4enw477al9n/w/PiCkD/BGpeBGIgTcTf7e2AcOooJ77m jvL8IdQOirKaZ/ZqAsg0Bs6P9IJ2o30aPGO8XplT+QcEvnYLsan9V/O83nS7J4vqFs+J eU5KmgRuyti6UINr4wiN1S/0SIUjycYzISt27iHdVYAMDGs306ofyXLFc7I4m5ng0bUe fXa2oKaCbK/LIWRb+CdnAzgM1hU4+CVxRVfgc+J0vaECTTkfd/GdscvEKv9oLsl6j0ud cHNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697183332; x=1697788132; 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=dszJkstXMUB4hIMHgiMs+n0waKBu2LYR6hRex+ii310=; b=LWEyRzlhUyt+TGQZnc2N+qA5wzfpGGDXqlj7Sm2pa15yT2FGRrgEloahKOTJY+850Y 6Q4ej0EYwSRfSKvkgpnpnPvJNZFJN/YJ6YLSblr1GL9uVSS2Blioh/QxI1JIrPwo/W1J HolSxL1yf4xHEaKW4hCgyvjZyoXRt8DEGOApyPzSNFsq0EilZJZ1EDuPHyCbE9ggZII8 EoDG2lV0JSSzzMaPX36RINNBHlDtwZrUfkyEDV7wednBie6xliPShMCrSfcnoFRpb6Oz gAmtY6+uAlcyB8QB9XMzCXqTIf7NCPGUYCYCaUN76GdSI6R+T6mH023wQJZ/EI4U8AGd +K3w== X-Gm-Message-State: AOJu0Yyc+klYSaW2KSubZE/2Xd8pybyNl5GbPEapqtDwS0Tp0I0i586y IcgJ1Ow0mChaaHJoHwpfLsFJZkqtPW2woUFMpU2JTA== X-Google-Smtp-Source: AGHT+IHM10BjP+s0fmXFfQ511pbuhEK/O/6snajg0IuZcvVEpq+qozB4AuETjMtescT6TGMa5ibX7A== X-Received: by 2002:aa7:ccd3:0:b0:538:a47:89d3 with SMTP id y19-20020aa7ccd3000000b005380a4789d3mr21114841edt.21.1697183332205; Fri, 13 Oct 2023 00:48:52 -0700 (PDT) Received: from localhost.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id m16-20020a7bca50000000b003fee6e170f9sm1791890wml.45.2023.10.13.00.48.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 00:48:51 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Fri, 13 Oct 2023 08:48:29 +0100 Message-Id: <20231013074841.16972-9-naush@raspberrypi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231013074841.16972-1-naush@raspberrypi.com> References: <20231013074841.16972-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 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 Cc: Jacopo Mondi 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;