Skip to content

Commit

Permalink
Revert "libcamera: ipu3: imgu: Add pipe calculation debug"
Browse files Browse the repository at this point in the history
This reverts commit 5b015e9.

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>
  • Loading branch information
jmondi committed May 27, 2021
1 parent 66f58fb commit d1d1939
Showing 1 changed file with 4 additions and 30 deletions.
34 changes: 4 additions & 30 deletions src/libcamera/pipeline/ipu3/imgu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
namespace libcamera {

LOG_DECLARE_CATEGORY(IPU3)
LOG_DEFINE_CATEGORY(ImgUPipe)

namespace {

Expand Down Expand Up @@ -129,18 +128,13 @@ 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) /
static_cast<float>(gdc.width);
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) {

Expand Down Expand Up @@ -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 {
Expand All @@ -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 });
}
}

Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down

0 comments on commit d1d1939

Please sign in to comment.