summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/libcamera/pipeline/ipu3/imgu.cpp34
1 files changed, 4 insertions, 30 deletions
diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp
index 6bfd23be..3e517ac6 100644
--- a/src/libcamera/pipeline/ipu3/imgu.cpp
+++ b/src/libcamera/pipeline/ipu3/imgu.cpp
@@ -23,7 +23,6 @@
namespace libcamera {
LOG_DECLARE_CATEGORY(IPU3)
-LOG_DEFINE_CATEGORY(ImgUPipe)
namespace {
@@ -129,8 +128,6 @@ void calculateBDSHeight(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc
unsigned int ifHeight;
float bdsHeight;
- LOG(ImgUPipe, Debug) << "BDS sf: " << bdsSF << ", BDS width: " << bdsWidth;
-
if (!isSameRatio(pipe->input, gdc)) {
unsigned int foundIfHeight = 0;
float estIFHeight = (iif.width * gdc.height) /
@@ -138,9 +135,6 @@ void calculateBDSHeight(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc
estIFHeight = std::clamp<float>(estIFHeight, minIFHeight, iif.height);
ifHeight = utils::alignUp(estIFHeight, IF_ALIGN_H);
- LOG(ImgUPipe, Debug) << "Estimated IF Height: " << estIFHeight
- << ", IF Height: " << ifHeight;
-
while (ifHeight >= minIFHeight && ifHeight <= iif.height &&
ifHeight / bdsSF >= minBDSHeight) {
@@ -176,15 +170,9 @@ void calculateBDSHeight(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc
if (foundIfHeight) {
unsigned int bdsIntHeight = static_cast<unsigned int>(bdsHeight);
- Size foundIf{ iif.width, foundIfHeight };
- Size foundBds{ bdsWidth, bdsIntHeight };
- LOG(ImgUPipe, Debug)
- << "IF: " << foundIf.toString()
- << ", BDS: " << foundBds.toString()
- << ", GDC: " << gdc.toString();
-
- pipeConfigs.push_back({ bdsSF, foundIf, foundBds, gdc });
+ pipeConfigs.push_back({ bdsSF, { iif.width, foundIfHeight },
+ { bdsWidth, bdsIntHeight }, gdc });
return;
}
} else {
@@ -197,15 +185,8 @@ void calculateBDSHeight(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc
if (!(ifHeight % IF_ALIGN_H) &&
!(bdsIntHeight % BDS_ALIGN_H)) {
- Size foundIf{ iif.width, ifHeight };
- Size foundBds{ bdsWidth, bdsIntHeight };
-
- LOG(ImgUPipe, Debug)
- << "IF: " << foundIf.toString()
- << ", BDS: " << foundBds.toString()
- << ", GDC: " << gdc.toString();
-
- pipeConfigs.push_back({ bdsSF, foundIf, foundBds, gdc });
+ pipeConfigs.push_back({ bdsSF, { iif.width, ifHeight },
+ { bdsWidth, bdsIntHeight }, gdc });
}
}
@@ -283,8 +264,6 @@ Size calculateGDC(ImgUDevice::Pipe *pipe)
gdc.width = main.width * sf;
gdc.height = main.height * sf;
- LOG(ImgUPipe, Debug) << "GDC: " << gdc.toString();
-
return gdc;
}
@@ -302,11 +281,6 @@ FOV calcFOV(const Size &in, const ImgUDevice::PipeConfig &pipe)
fov.w = (inW - (ifCropW + gdcCropW)) / inW;
fov.h = (inH - (ifCropH + gdcCropH)) / inH;
- LOG(ImgUPipe, Debug)
- << "IF (" << pipe.iif.toString() << ") - BDS ("
- << pipe.bds.toString() << ") - GDC (" << pipe.gdc.toString()
- << ") -> FOV: " << fov.w << "x" << fov.h;
-
return fov;
}