ipa: ipu3, mali-c55, rkisp1, rpi: Fix reporting non-scalar controls
The ControlInfos of non-scalar controls that are reported in controls() must have non-scalar default values for controls that have a defined size. This is because applications should be able to directly set the default value from a ControlInfo to the control. Currently this is relevant to the following controls: - ColourGains - ColourCorrectionMatrix - FrameDurationLimits - AfWindows Fix the scalarness of these controls where relevant. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Tested-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com> # rkisp1 Reviewed-by: Naushir Patuck <naush@raspberrypi.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
committed by
Kieran Bingham
parent
cfdc281100
commit
4e9be7d11b
@@ -91,7 +91,9 @@ int Awb::init(IPAContext &context, const YamlObject &tuningData)
|
||||
kMaxColourTemperature,
|
||||
kDefaultColourTemperature);
|
||||
cmap[&controls::AwbEnable] = ControlInfo(false, true);
|
||||
cmap[&controls::ColourGains] = ControlInfo(0.0f, 3.996f, 1.0f);
|
||||
|
||||
cmap[&controls::ColourGains] = ControlInfo(0.0f, 3.996f,
|
||||
Span<const float, 2>{ { 1.0f, 1.0f } });
|
||||
|
||||
if (!tuningData.contains("algorithm"))
|
||||
LOG(RkISP1Awb, Info) << "No AWB algorithm specified."
|
||||
|
||||
@@ -439,7 +439,8 @@ void IPARkISP1::updateControls(const IPACameraSensorInfo &sensorInfo,
|
||||
|
||||
/* \todo Move this (and other agc-related controls) to agc */
|
||||
context_.ctrlMap[&controls::FrameDurationLimits] =
|
||||
ControlInfo(frameDurations[0], frameDurations[1], frameDurations[2]);
|
||||
ControlInfo(frameDurations[0], frameDurations[1],
|
||||
ControlValue(Span<const int64_t, 2>{ { frameDurations[2], frameDurations[2] } }));
|
||||
|
||||
ctrlMap.insert(context_.ctrlMap.begin(), context_.ctrlMap.end());
|
||||
*ipaControls = ControlInfoMap(std::move(ctrlMap), controls::controls);
|
||||
|
||||
Reference in New Issue
Block a user