[libcamera-devel] [PATCH v2 1/5] ipa: raspberrypi: controller: Replace Raspberry Pi debug with libcamera debug

[Laurent Pinchart]

Hi David,

Thank you for the patch.

On Mon, Jan 25, 2021 at 06:48:54PM +0000, David Plowman wrote:
> Some unhelpful debug statements have been removed.
> 
> Signed-off-by: David Plowman <david.plowman at raspberrypi.com>
> Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

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

-- 
Regards,

Laurent Pinchart