From d1d1939602384a4c17afecd4fd2d05bbaf7f1ddf Mon Sep 17 00:00:00 2001
From: Jacopo Mondi <jacopo@jmondi.org>
Date: Thu, 27 May 2021 13:52:48 +0200
Subject: Revert "libcamera: ipu3: imgu: Add pipe calculation debug"
This reverts commit 5b015e96ccdbcd87b4ba6484199652fec5cdb38a.
The ImgU pipe configuration debug is useful to test the correctness
of the parameters computation against the Intel Python script.
However, the number of debug messages which is printed out by the
configuration procedure is so high it floods the logs, up to the point
that starting the Android camera3 HAL, which tests several configurations
at startup, becomes so slow it is barely usable.
Revert the patch that adds the excessive debug statements, which are mostly
useful only when testing the configuration procedure.
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Acked-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
src/libcamera/pipeline/ipu3/imgu.cpp | 34 ++++------------------------------
1 file 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;
}
--
cgit v1.2.1