NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

ipa: raspberrypi: agc: Use YamlObject::getList()

Browse source 
Replace the manual implementation of the readList() functions with
YamlObject::getList().

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Naushir Patuck <naush@raspberrypi.com>
Tested-by: Naushir Patuck <naush@raspberrypi.com>
This commit is contained in:
Laurent Pinchart 2022-07-26 05:46:40 +03:00
parent 02e387e7b6
commit c13f86704b
1 changed files with 13 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/ipa/raspberrypi/controller/rpi/agc.cpp
View file

@ -5,6 +5,7 @@
* agc.cpp - AGC/AEC control algorithm * agc.cpp - AGC/AEC control algorithm
*/ */
#include <algorithm>
#include <map> #include <map>
#include <tuple> #include <tuple>
@ -71,44 +72,26 @@ readMeteringModes(std::map<std::string, AgcMeteringMode> &metering_modes,
return { 0, first }; return { 0, first };
} }
static int readList(std::vector<double> &list,
const libcamera::YamlObject &params)
{
for (const auto &p : params.asList()) {
auto value = p.get<double>();
if (!value)
return -EINVAL;
list.push_back(*value);
}
return list.size();
}
static int readList(std::vector<Duration> &list,
const libcamera::YamlObject &params)
{
for (const auto &p : params.asList()) {
auto value = p.get<double>();
if (!value)
return -EINVAL;
list.push_back(*value * 1us);
}
return list.size();
}
int AgcExposureMode::read(const libcamera::YamlObject &params) int AgcExposureMode::read(const libcamera::YamlObject &params)
{ {
int numShutters = readList(shutter, params["shutter"]); auto value = params["shutter"].getList<double>();
int numAgs = readList(gain, params["gain"]); if (!value)
return -EINVAL;
std::transform(value->begin(), value->end(), std::back_inserter(shutter),
[](double v) { return v * 1us; });
if (numShutters < 2 || numAgs < 2) { value = params["gain"].getList<double>();
if (!value)
return -EINVAL;
gain = std::move(*value);
if (shutter.size() < 2 || gain.size() < 2) {
LOG(RPiAgc, Error) LOG(RPiAgc, Error)
<< "AgcExposureMode: must have at least two entries in exposure profile"; << "AgcExposureMode: must have at least two entries in exposure profile";
return -EINVAL; return -EINVAL;
} }
if (numShutters != numAgs) { if (shutter.size() != gain.size()) {
LOG(RPiAgc, Error) LOG(RPiAgc, Error)
<< "AgcExposureMode: expect same number of exposure and gain entries in exposure profile"; << "AgcExposureMode: expect same number of exposure and gain entries in exposure profile";
return -EINVAL; return -EINVAL;