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

ipa: raspberrypi: controller: Replace Raspberry Pi debug with libcamera debug

Browse source 
Some unhelpful debug statements have been removed.

Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
David Plowman 2021-01-25 18:48:54 +00:00 • committed by Laurent Pinchart
parent 3e979d7266
commit 15d3970c0c
1 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,6 +5,8 @@
* controller.cpp - ISP controller * controller.cpp - ISP controller
*/ */
#include "libcamera/internal/log.h"
#include "algorithm.hpp" #include "algorithm.hpp"
#include "controller.hpp" #include "controller.hpp"
@ -12,6 +14,9 @@
#include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree.hpp>
using namespace RPiController; using namespace RPiController;
using namespace libcamera;
LOG_DEFINE_CATEGORY(RPiController)
Controller::Controller() Controller::Controller()
: switch_mode_called_(false) {} : switch_mode_called_(false) {}
@ -27,7 +32,6 @@ Controller::~Controller() {}
void Controller::Read(char const *filename) void Controller::Read(char const *filename)
{ {
RPI_LOG("Controller starting");
boost::property_tree::ptree root; boost::property_tree::ptree root;
boost::property_tree::read_json(filename, root); boost::property_tree::read_json(filename, root);
for (auto const &key_and_value : root) { for (auto const &key_and_value : root) {
@ -36,10 +40,9 @@ void Controller::Read(char const *filename)
algo->Read(key_and_value.second); algo->Read(key_and_value.second);
algorithms_.push_back(AlgorithmPtr(algo)); algorithms_.push_back(AlgorithmPtr(algo));
} else } else
RPI_LOG("WARNING: No algorithm found for \"" LOG(RPiController, Warning)
<< key_and_value.first << "\""); << "No algorithm found for \"" << key_and_value.first << "\"";
} }
RPI_LOG("Controller finished");
} }
Algorithm *Controller::CreateAlgorithm(char const *name) Algorithm *Controller::CreateAlgorithm(char const *name)
@ -50,39 +53,31 @@ Algorithm *Controller::CreateAlgorithm(char const *name)
void Controller::Initialise() void Controller::Initialise()
{ {
RPI_LOG("Controller starting");
for (auto &algo : algorithms_) for (auto &algo : algorithms_)
algo->Initialise(); algo->Initialise();
RPI_LOG("Controller finished");
} }
void Controller::SwitchMode(CameraMode const &camera_mode, Metadata *metadata) void Controller::SwitchMode(CameraMode const &camera_mode, Metadata *metadata)
{ {
RPI_LOG("Controller starting");
for (auto &algo : algorithms_) for (auto &algo : algorithms_)
algo->SwitchMode(camera_mode, metadata); algo->SwitchMode(camera_mode, metadata);
switch_mode_called_ = true; switch_mode_called_ = true;
RPI_LOG("Controller finished");
} }
void Controller::Prepare(Metadata *image_metadata) void Controller::Prepare(Metadata *image_metadata)
{ {
RPI_LOG("Controller::Prepare starting");
assert(switch_mode_called_); assert(switch_mode_called_);
for (auto &algo : algorithms_) for (auto &algo : algorithms_)
if (!algo->IsPaused()) if (!algo->IsPaused())
algo->Prepare(image_metadata); algo->Prepare(image_metadata);
RPI_LOG("Controller::Prepare finished");
} }
void Controller::Process(StatisticsPtr stats, Metadata *image_metadata) void Controller::Process(StatisticsPtr stats, Metadata *image_metadata)
{ {
RPI_LOG("Controller::Process starting");
assert(switch_mode_called_); assert(switch_mode_called_);
for (auto &algo : algorithms_) for (auto &algo : algorithms_)
if (!algo->IsPaused()) if (!algo->IsPaused())
algo->Process(stats, image_metadata); algo->Process(stats, image_metadata);
RPI_LOG("Controller::Process finished");
} }
Metadata &Controller::GetGlobalMetadata() Metadata &Controller::GetGlobalMetadata()