Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-25 17:45:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcamera: ipu3: imgu: Add pipe calculation debug

Browse source 
Add pipe calculation debug with a new associated log category.

This helps compare the pipe calculation with the one performed by the
python script.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Tested-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Reviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
This commit is contained in:
Jacopo Mondi 2021-03-17 17:00:06 +01:00
parent 5be6313d32
commit 5b015e96cc
1 changed files with 30 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,6 +23,7 @@
namespace libcamera { namespace libcamera {
LOG_DECLARE_CATEGORY(IPU3) LOG_DECLARE_CATEGORY(IPU3)
LOG_DEFINE_CATEGORY(ImgUPipe)
namespace { namespace {
@ -128,6 +129,8 @@ 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) /
@ -135,6 +138,9 @@ 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) {
@ -170,9 +176,15 @@ 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 };
pipeConfigs.push_back({ bdsSF, { iif.width, foundIfHeight }, LOG(ImgUPipe, Debug)
{ bdsWidth, bdsIntHeight }, gdc }); << "IF: " << foundIf.toString()
<< ", BDS: " << foundBds.toString()
<< ", GDC: " << gdc.toString();
pipeConfigs.push_back({ bdsSF, foundIf, foundBds, gdc });
return; return;
} }
} else { } else {
@ -185,8 +197,15 @@ 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)) {
pipeConfigs.push_back({ bdsSF, { iif.width, ifHeight }, Size foundIf{ iif.width, ifHeight };
{ bdsWidth, bdsIntHeight }, gdc }); Size foundBds{ bdsWidth, bdsIntHeight };
LOG(ImgUPipe, Debug)
<< "IF: " << foundIf.toString()
<< ", BDS: " << foundBds.toString()
<< ", GDC: " << gdc.toString();
pipeConfigs.push_back({ bdsSF, foundIf, foundBds, gdc });
} }
} }
@ -264,6 +283,8 @@ 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;
} }
@ -281,6 +302,11 @@ 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;
} }