summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaushir Patuck <naush@raspberrypi.com>2023-10-13 08:48:29 +0100
committerKieran Bingham <kieran.bingham@ideasonboard.com>2023-10-18 11:01:22 +0100
commit56ca5091debff3a74a9ff146ee6a15eda47047bc (patch)
treed636fa5ccec55e8279a33a3ac550a2c3573cd58c
parent11c939a200dd501b074d3dd11111dac26dd8fb4d (diff)
ipa: rpi: Add PiSP definitions to the Controller hardware description
Add an entry to Controller::HardwareConfig describing the PiSP hardware for the IPA and controller algorithms to use. Signed-off-by: Naushir Patuck <naush@raspberrypi.com> Reviewed-by: David Plowman <david.plowman@raspberrypi.com> Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
-rw-r--r--src/ipa/rpi/controller/controller.cpp15
-rw-r--r--src/ipa/rpi/controller/controller.h1
2 files changed, 16 insertions, 0 deletions
diff --git a/src/ipa/rpi/controller/controller.cpp b/src/ipa/rpi/controller/controller.cpp
index 4b6f82b4..e62becd8 100644
--- a/src/ipa/rpi/controller/controller.cpp
+++ b/src/ipa/rpi/controller/controller.cpp
@@ -31,6 +31,7 @@ static const std::map<std::string, Controller::HardwareConfig> 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<std::string, Controller::HardwareConfig> 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 a8bc6188..6e5f5952 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;