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

Revert "libcamera: ipu3: imgu: Add pipe calculation debug"

Browse source 
This reverts commit 5b015e96cc.

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>
This commit is contained in:
Jacopo Mondi 2021-05-27 13:52:48 +02:00
parent 66f58fbf06
commit d1d1939602
1 changed files with 4 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/libcamera/pipeline/ipu3/imgu.cpp
View file

@ -23,7 +23,6 @@
namespace libcamera { namespace libcamera {
LOG_DECLARE_CATEGORY(IPU3) LOG_DECLARE_CATEGORY(IPU3)
LOG_DEFINE_CATEGORY(ImgUPipe)
namespace { namespace {
@ -129,8 +128,6 @@ void calculateBDSHeight(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc
unsigned int ifHeight; unsigned int ifHeight;
float bdsHeight; float bdsHeight;
LOG(ImgUPipe, Debug) << "BDS sf: " << bdsSF << ", BDS width: " << bdsWidth;
if (!isSameRatio(pipe->input, gdc)) { if (!isSameRatio(pipe->input, gdc)) {
unsigned int foundIfHeight = 0; unsigned int foundIfHeight = 0;
float estIFHeight = (iif.width * gdc.height) / 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); estIFHeight = std::clamp<float>(estIFHeight, minIFHeight, iif.height);
ifHeight = utils::alignUp(estIFHeight, IF_ALIGN_H); ifHeight = utils::alignUp(estIFHeight, IF_ALIGN_H);
LOG(ImgUPipe, Debug) << "Estimated IF Height: " << estIFHeight
<< ", IF Height: " << ifHeight;
while (ifHeight >= minIFHeight && ifHeight <= iif.height && while (ifHeight >= minIFHeight && ifHeight <= iif.height &&
ifHeight / bdsSF >= minBDSHeight) { ifHeight / bdsSF >= minBDSHeight) {
@ -176,15 +170,9 @@ void calculateBDSHeight(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc
if (foundIfHeight) { if (foundIfHeight) {
unsigned int bdsIntHeight = static_cast<unsigned int>(bdsHeight); unsigned int bdsIntHeight = static_cast<unsigned int>(bdsHeight);
Size foundIf{ iif.width, foundIfHeight };
Size foundBds{ bdsWidth, bdsIntHeight };
LOG(ImgUPipe, Debug) pipeConfigs.push_back({ bdsSF, { iif.width, foundIfHeight },
<< "IF: " << foundIf.toString() { bdsWidth, bdsIntHeight }, gdc });
<< ", BDS: " << foundBds.toString()
<< ", GDC: " << gdc.toString();
pipeConfigs.push_back({ bdsSF, foundIf, foundBds, gdc });
return; return;
} }
} else { } else {
@ -197,15 +185,8 @@ void calculateBDSHeight(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc
if (!(ifHeight % IF_ALIGN_H) && if (!(ifHeight % IF_ALIGN_H) &&
!(bdsIntHeight % BDS_ALIGN_H)) { !(bdsIntHeight % BDS_ALIGN_H)) {
Size foundIf{ iif.width, ifHeight }; pipeConfigs.push_back({ bdsSF, { iif.width, ifHeight },
Size foundBds{ bdsWidth, bdsIntHeight }; { bdsWidth, bdsIntHeight }, gdc });
LOG(ImgUPipe, Debug)
<< "IF: " << foundIf.toString()
<< ", BDS: " << foundBds.toString()
<< ", GDC: " << gdc.toString();
pipeConfigs.push_back({ bdsSF, foundIf, foundBds, gdc });
} }
} }
@ -283,8 +264,6 @@ Size calculateGDC(ImgUDevice::Pipe *pipe)
gdc.width = main.width * sf; gdc.width = main.width * sf;
gdc.height = main.height * sf; gdc.height = main.height * sf;
LOG(ImgUPipe, Debug) << "GDC: " << gdc.toString();
return gdc; return gdc;
} }
@ -302,11 +281,6 @@ FOV calcFOV(const Size &in, const ImgUDevice::PipeConfig &pipe)
fov.w = (inW - (ifCropW + gdcCropW)) / inW; fov.w = (inW - (ifCropW + gdcCropW)) / inW;
fov.h = (inH - (ifCropH + gdcCropH)) / inH; 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; return fov;
} }