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

ipa: Use Vector class from libcamera

Browse source 
Now that there is a Vector class in libcamera, use that one.

Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Naushir Patuck <naush@raspberrypi.com>
This commit is contained in:
Stefan Klug 2025-02-06 15:10:10 +01:00
parent cfd94e5f85
commit 82cf918b5b
6 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ipa/ipu3/algorithms/awb.h
View file

@ -13,7 +13,7 @@
#include <libcamera/geometry.h> #include <libcamera/geometry.h>
#include "libipa/vector.h" #include "libcamera/internal/vector.h"
#include "algorithm.h" #include "algorithm.h"

2
src/ipa/libipa/colours.h
View file

@ -9,7 +9,7 @@
#include <stdint.h> #include <stdint.h>
#include "vector.h" #include "libcamera/internal/vector.h"
namespace libcamera { namespace libcamera {

2
src/ipa/libipa/pwl.h
View file

@ -12,7 +12,7 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "vector.h" #include "libcamera/internal/vector.h"
namespace libcamera { namespace libcamera {

3
src/ipa/rkisp1/algorithms/awb.h
View file

@ -9,8 +9,9 @@
#include <optional> #include <optional>
#include "libcamera/internal/vector.h"
#include "libipa/interpolator.h" #include "libipa/interpolator.h"
#include "libipa/vector.h"
#include "algorithm.h" #include "algorithm.h"

2
src/ipa/rkisp1/ipa_context.h
View file

@ -22,10 +22,10 @@
#include "libcamera/internal/debug_controls.h" #include "libcamera/internal/debug_controls.h"
#include "libcamera/internal/matrix.h" #include "libcamera/internal/matrix.h"
#include "libcamera/internal/vector.h"
#include <libipa/camera_sensor_helper.h> #include <libipa/camera_sensor_helper.h>
#include <libipa/fc_queue.h> #include <libipa/fc_queue.h>
#include <libipa/vector.h>
namespace libcamera { namespace libcamera {

7
src/ipa/rpi/controller/rpi/agc_channel.cpp
View file

@ -12,8 +12,9 @@
#include <libcamera/base/log.h> #include <libcamera/base/log.h>
#include "libcamera/internal/vector.h"
#include "libipa/colours.h" #include "libipa/colours.h"
#include "libipa/vector.h"
#include "../awb_status.h" #include "../awb_status.h"
#include "../device_status.h" #include "../device_status.h"
@ -700,7 +701,7 @@ static double computeInitialY(StatisticsPtr &stats, AwbStatus const &awb,
* Note that the weights are applied by the IPA to the statistics directly, * Note that the weights are applied by the IPA to the statistics directly,
* before they are given to us here. * before they are given to us here.
*/ */
ipa::RGB<double> sum{ 0.0 }; RGB<double> sum{ 0.0 };
double pixelSum = 0; double pixelSum = 0;
for (unsigned int i = 0; i < stats->agcRegions.numRegions(); i++) { for (unsigned int i = 0; i < stats->agcRegions.numRegions(); i++) {
auto &region = stats->agcRegions.get(i); auto &region = stats->agcRegions.get(i);
@ -716,7 +717,7 @@ static double computeInitialY(StatisticsPtr &stats, AwbStatus const &awb,
/* Factor in the AWB correction if needed. */ /* Factor in the AWB correction if needed. */
if (stats->agcStatsPos == Statistics::AgcStatsPos::PreWb) if (stats->agcStatsPos == Statistics::AgcStatsPos::PreWb)
sum *= ipa::RGB<double>{{ awb.gainR, awb.gainR, awb.gainB }}; sum *= RGB<double>{ { awb.gainR, awb.gainR, awb.gainB } };
double ySum = ipa::rec601LuminanceFromRGB(sum); double ySum = ipa::rec601LuminanceFromRGB(sum);