Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-14 16:09:51 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

ipa: raspberrypi: Code refactoring to match style guidelines

Browse source 
Refactor all the source files in src/ipa/raspberrypi/ to match the recommended
formatting guidelines for the libcamera project. The vast majority of changes
in this commit comprise of switching from snake_case to CamelCase, and starting
class member functions with a lower case character.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Naushir Patuck 2022-07-27 09:55:17 +01:00 • committed by Laurent Pinchart
parent b4a3eb6b98
commit 177df04d2b
63 changed files with 2093 additions and 2161 deletions
Download patch file Download diff file Expand all files Collapse all files

76
src/ipa/raspberrypi/controller/controller.cpp
View file

@ -19,85 +19,87 @@ using namespace libcamera;
LOG_DEFINE_CATEGORY(RPiController)
Controller::Controller()
: switch_mode_called_(false) {}
Controller::Controller(char const *json_filename)
: switch_mode_called_(false)
: switchModeCalled_(false)
{
Read(json_filename);
Initialise();
}
Controller::Controller(char const *jsonFilename)
: switchModeCalled_(false)
{
read(jsonFilename);
initialise();
}
Controller::~Controller() {}
void Controller::Read(char const *filename)
void Controller::read(char const *filename)
{
boost::property_tree::ptree root;
boost::property_tree::read_json(filename, root);
for (auto const &key_and_value : root) {
Algorithm *algo = CreateAlgorithm(key_and_value.first.c_str());
for (auto const &keyAndValue : root) {
Algorithm *algo = createAlgorithm(keyAndValue.first.c_str());
if (algo) {
algo->Read(key_and_value.second);
algo->read(keyAndValue.second);
algorithms_.push_back(AlgorithmPtr(algo));
} else
LOG(RPiController, Warning)
<< "No algorithm found for \"" << key_and_value.first << "\"";
<< "No algorithm found for \"" << keyAndValue.first << "\"";
}
}
Algorithm *Controller::CreateAlgorithm(char const *name)
Algorithm *Controller::createAlgorithm(char const *name)
{
auto it = GetAlgorithms().find(std::string(name));
return it != GetAlgorithms().end() ? (*it->second)(this) : nullptr;
auto it = getAlgorithms().find(std::string(name));
return it != getAlgorithms().end() ? (*it->second)(this) : nullptr;
}
void Controller::Initialise()
void Controller::initialise()
{
for (auto &algo : algorithms_)
algo->Initialise();
algo->initialise();
}
void Controller::SwitchMode(CameraMode const &camera_mode, Metadata *metadata)
void Controller::switchMode(CameraMode const &cameraMode, Metadata *metadata)
{
for (auto &algo : algorithms_)
algo->SwitchMode(camera_mode, metadata);
switch_mode_called_ = true;
algo->switchMode(cameraMode, metadata);
switchModeCalled_ = true;
}
void Controller::Prepare(Metadata *image_metadata)
void Controller::prepare(Metadata *imageMetadata)
{
assert(switch_mode_called_);
assert(switchModeCalled_);
for (auto &algo : algorithms_)
if (!algo->IsPaused())
algo->Prepare(image_metadata);
if (!algo->isPaused())
algo->prepare(imageMetadata);
}
void Controller::Process(StatisticsPtr stats, Metadata *image_metadata)
void Controller::process(StatisticsPtr stats, Metadata *imageMetadata)
{
assert(switch_mode_called_);
assert(switchModeCalled_);
for (auto &algo : algorithms_)
if (!algo->IsPaused())
algo->Process(stats, image_metadata);
if (!algo->isPaused())
algo->process(stats, imageMetadata);
}
Metadata &Controller::GetGlobalMetadata()
Metadata &Controller::getGlobalMetadata()
{
return global_metadata_;
return globalMetadata_;
}
Algorithm *Controller::GetAlgorithm(std::string const &name) const
Algorithm *Controller::getAlgorithm(std::string const &name) const
{
// The passed name must be the entire algorithm name, or must match the
// last part of it with a period (.) just before.
size_t name_len = name.length();
size_t nameLen = name.length();
for (auto &algo : algorithms_) {
char const *algo_name = algo->Name();
size_t algo_name_len = strlen(algo_name);
if (algo_name_len >= name_len &&
char const *algoName = algo->name();
size_t algoNameLen = strlen(algoName);
if (algoNameLen >= nameLen &&
strcasecmp(name.c_str(),
algo_name + algo_name_len - name_len) == 0 &&
(name_len == algo_name_len ||
algo_name[algo_name_len - name_len - 1] == '.'))
algoName + algoNameLen - nameLen) == 0 &&
(nameLen == algoNameLen ||
algoName[algoNameLen - nameLen - 1] == '.'))
return algo.get();
}
return nullptr;