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

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

Browse source 
Some unhelpful debug messages 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:55 +00:00 • committed by Laurent Pinchart
parent 15d3970c0c
commit b2186c2b89
1 changed files with 35 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/ipa/raspberrypi/controller/rpi/alsc.cpp
View file

@ -6,12 +6,17 @@
*/ */
#include <math.h> #include <math.h>
#include "libcamera/internal/log.h"
#include "../awb_status.h" #include "../awb_status.h"
#include "alsc.hpp" #include "alsc.hpp"
// Raspberry Pi ALSC (Auto Lens Shading Correction) algorithm. // Raspberry Pi ALSC (Auto Lens Shading Correction) algorithm.
using namespace RPiController; using namespace RPiController;
using namespace libcamera;
LOG_DEFINE_CATEGORY(RPiAlsc)
#define NAME "rpi.alsc" #define NAME "rpi.alsc"
@ -110,15 +115,14 @@ static void read_calibrations(std::vector<AlscCalibration> &calibrations,
"Alsc: too few values for ct " + "Alsc: too few values for ct " +
std::to_string(ct) + " in " + name); std::to_string(ct) + " in " + name);
calibrations.push_back(calibration); calibrations.push_back(calibration);
RPI_LOG("Read " << name << " calibration for ct " LOG(RPiAlsc, Debug)
<< ct); << "Read " << name << " calibration for ct " << ct;
} }
} }
} }
void Alsc::Read(boost::property_tree::ptree const &params) void Alsc::Read(boost::property_tree::ptree const &params)
{ {
RPI_LOG("Alsc");
config_.frame_period = params.get<uint16_t>("frame_period", 12); config_.frame_period = params.get<uint16_t>("frame_period", 12);
config_.startup_frames = params.get<uint16_t>("startup_frames", 10); config_.startup_frames = params.get<uint16_t>("startup_frames", 10);
config_.speed = params.get<double>("speed", 0.05); config_.speed = params.get<double>("speed", 0.05);
@ -139,7 +143,8 @@ void Alsc::Read(boost::property_tree::ptree const &params)
read_lut(config_.luminance_lut, read_lut(config_.luminance_lut,
params.get_child("luminance_lut")); params.get_child("luminance_lut"));
else else
RPI_WARN("Alsc: no luminance table - assume unity everywhere"); LOG(RPiAlsc, Warning)
<< "no luminance table - assume unity everywhere";
read_calibrations(config_.calibrations_Cr, params, "calibrations_Cr"); read_calibrations(config_.calibrations_Cr, params, "calibrations_Cr");
read_calibrations(config_.calibrations_Cb, params, "calibrations_Cb"); read_calibrations(config_.calibrations_Cb, params, "calibrations_Cb");
config_.default_ct = params.get<double>("default_ct", 4500.0); config_.default_ct = params.get<double>("default_ct", 4500.0);
@ -164,7 +169,6 @@ static void add_luminance_to_tables(double results[3][Y][X],
void Alsc::Initialise() void Alsc::Initialise()
{ {
RPI_LOG("Alsc");
frame_count2_ = frame_count_ = frame_phase_ = 0; frame_count2_ = frame_count_ = frame_phase_ = 0;
first_time_ = true; first_time_ = true;
ct_ = config_.default_ct; ct_ = config_.default_ct;
@ -252,7 +256,7 @@ void Alsc::SwitchMode(CameraMode const &camera_mode,
void Alsc::fetchAsyncResults() void Alsc::fetchAsyncResults()
{ {
RPI_LOG("Fetch ALSC results"); LOG(RPiAlsc, Debug) << "Fetch ALSC results";
async_finished_ = false; async_finished_ = false;
async_started_ = false; async_started_ = false;
memcpy(sync_results_, async_results_, sizeof(sync_results_)); memcpy(sync_results_, async_results_, sizeof(sync_results_));
@ -263,11 +267,11 @@ double get_ct(Metadata *metadata, double default_ct)
AwbStatus awb_status; AwbStatus awb_status;
awb_status.temperature_K = default_ct; // in case nothing found awb_status.temperature_K = default_ct; // in case nothing found
if (metadata->Get("awb.status", awb_status) != 0) if (metadata->Get("awb.status", awb_status) != 0)
RPI_WARN("Alsc: no AWB results found, using " LOG(RPiAlsc, Warning) << "no AWB results found, using "
<< awb_status.temperature_K); << awb_status.temperature_K;
else else
RPI_LOG("Alsc: AWB results found, using " LOG(RPiAlsc, Debug) << "AWB results found, using "
<< awb_status.temperature_K); << awb_status.temperature_K;
return awb_status.temperature_K; return awb_status.temperature_K;
} }
@ -289,7 +293,7 @@ static void copy_stats(bcm2835_isp_stats_region regions[XY], StatisticsPtr &stat
void Alsc::restartAsync(StatisticsPtr &stats, Metadata *image_metadata) void Alsc::restartAsync(StatisticsPtr &stats, Metadata *image_metadata)
{ {
RPI_LOG("Starting ALSC thread"); LOG(RPiAlsc, Debug) << "Starting ALSC calculation";
// Get the current colour temperature. It's all we need from the // Get the current colour temperature. It's all we need from the
// metadata. Default to the last CT value (which could be the default). // metadata. Default to the last CT value (which could be the default).
ct_ = get_ct(image_metadata, ct_); ct_ = get_ct(image_metadata, ct_);
@ -297,7 +301,8 @@ void Alsc::restartAsync(StatisticsPtr &stats, Metadata *image_metadata)
// the LSC table that the pipeline applied to them. // the LSC table that the pipeline applied to them.
AlscStatus alsc_status; AlscStatus alsc_status;
if (image_metadata->Get("alsc.status", alsc_status) != 0) { if (image_metadata->Get("alsc.status", alsc_status) != 0) {
RPI_WARN("No ALSC status found for applied gains!"); LOG(RPiAlsc, Warning)
<< "No ALSC status found for applied gains!";
for (int y = 0; y < Y; y++) for (int y = 0; y < Y; y++)
for (int x = 0; x < X; x++) { for (int x = 0; x < X; x++) {
alsc_status.r[y][x] = 1.0; alsc_status.r[y][x] = 1.0;
@ -324,14 +329,13 @@ void Alsc::Prepare(Metadata *image_metadata)
double speed = frame_count_ < (int)config_.startup_frames double speed = frame_count_ < (int)config_.startup_frames
? 1.0 ? 1.0
: config_.speed; : config_.speed;
RPI_LOG("Alsc: frame_count " << frame_count_ << " speed " << speed); LOG(RPiAlsc, Debug)
<< "frame_count " << frame_count_ << " speed " << speed;
{ {
std::unique_lock<std::mutex> lock(mutex_); std::unique_lock<std::mutex> lock(mutex_);
if (async_started_ && async_finished_) { if (async_started_ && async_finished_)
RPI_LOG("ALSC thread finished");
fetchAsyncResults(); fetchAsyncResults();
} }
}
// Apply IIR filter to results and program into the pipeline. // Apply IIR filter to results and program into the pipeline.
double *ptr = (double *)sync_results_, double *ptr = (double *)sync_results_,
*pptr = (double *)prev_sync_results_; *pptr = (double *)prev_sync_results_;
@ -354,14 +358,12 @@ void Alsc::Process(StatisticsPtr &stats, Metadata *image_metadata)
frame_phase_++; frame_phase_++;
if (frame_count2_ < (int)config_.startup_frames) if (frame_count2_ < (int)config_.startup_frames)
frame_count2_++; frame_count2_++;
RPI_LOG("Alsc: frame_phase " << frame_phase_); LOG(RPiAlsc, Debug) << "frame_phase " << frame_phase_;
if (frame_phase_ >= (int)config_.frame_period || if (frame_phase_ >= (int)config_.frame_period ||
frame_count2_ < (int)config_.startup_frames) { frame_count2_ < (int)config_.startup_frames) {
if (async_started_ == false) { if (async_started_ == false)
RPI_LOG("ALSC thread starting");
restartAsync(stats, image_metadata); restartAsync(stats, image_metadata);
} }
}
} }
void Alsc::asyncFunc() void Alsc::asyncFunc()
@ -391,25 +393,26 @@ void get_cal_table(double ct, std::vector<AlscCalibration> const &calibrations,
if (calibrations.empty()) { if (calibrations.empty()) {
for (int i = 0; i < XY; i++) for (int i = 0; i < XY; i++)
cal_table[i] = 1.0; cal_table[i] = 1.0;
RPI_LOG("Alsc: no calibrations found"); LOG(RPiAlsc, Debug) << "no calibrations found";
} else if (ct <= calibrations.front().ct) { } else if (ct <= calibrations.front().ct) {
memcpy(cal_table, calibrations.front().table, memcpy(cal_table, calibrations.front().table,
XY * sizeof(double)); XY * sizeof(double));
RPI_LOG("Alsc: using calibration for " LOG(RPiAlsc, Debug) << "using calibration for "
<< calibrations.front().ct); << calibrations.front().ct;
} else if (ct >= calibrations.back().ct) { } else if (ct >= calibrations.back().ct) {
memcpy(cal_table, calibrations.back().table, memcpy(cal_table, calibrations.back().table,
XY * sizeof(double)); XY * sizeof(double));
RPI_LOG("Alsc: using calibration for " LOG(RPiAlsc, Debug) << "using calibration for "
<< calibrations.front().ct); << calibrations.front().ct;
} else { } else {
int idx = 0; int idx = 0;
while (ct > calibrations[idx + 1].ct) while (ct > calibrations[idx + 1].ct)
idx++; idx++;
double ct0 = calibrations[idx].ct, double ct0 = calibrations[idx].ct,
ct1 = calibrations[idx + 1].ct; ct1 = calibrations[idx + 1].ct;
RPI_LOG("Alsc: ct is " << ct << ", interpolating between " LOG(RPiAlsc, Debug)
<< ct0 << " and " << ct1); << "ct is " << ct << ", interpolating between "
<< ct0 << " and " << ct1;
for (int i = 0; i < XY; i++) for (int i = 0; i < XY; i++)
cal_table[i] = cal_table[i] =
(calibrations[idx].table[i] * (ct1 - ct) + (calibrations[idx].table[i] * (ct1 - ct) +
@ -660,15 +663,16 @@ static void run_matrix_iterations(double const C[XY], double lambda[XY],
for (int i = 0; i < n_iter; i++) { for (int i = 0; i < n_iter; i++) {
double max_diff = fabs(gauss_seidel2_SOR(M, omega, lambda)); double max_diff = fabs(gauss_seidel2_SOR(M, omega, lambda));
if (max_diff < threshold) { if (max_diff < threshold) {
RPI_LOG("Stop after " << i + 1 << " iterations"); LOG(RPiAlsc, Debug)
<< "Stop after " << i + 1 << " iterations";
break; break;
} }
// this happens very occasionally (so make a note), though // this happens very occasionally (so make a note), though
// doesn't seem to matter // doesn't seem to matter
if (max_diff > last_max_diff) if (max_diff > last_max_diff)
RPI_LOG("Iteration " << i << ": max_diff gone up " LOG(RPiAlsc, Debug)
<< last_max_diff << " to " << "Iteration " << i << ": max_diff gone up "
<< max_diff); << last_max_diff << " to " << max_diff;
last_max_diff = max_diff; last_max_diff = max_diff;
} }
// We're going to normalise the lambdas so the smallest is 1. Not sure // We're going to normalise the lambdas so the smallest is 1. Not sure