summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacopo Mondi <jacopo@jmondi.org>2021-03-17 17:00:06 +0100
committerJacopo Mondi <jacopo@jmondi.org>2021-05-20 10:58:52 +0200
commit5b015e96ccdbcd87b4ba6484199652fec5cdb38a (patch)
treed595506e885863a1a09bd06eac8f261af9665f04
parent5be6313d325a91e47251b831ee7c33a3e58c0cfb (diff)
libcamera: ipu3: imgu: Add pipe calculation debug
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>
-rw-r--r--src/libcamera/pipeline/ipu3/imgu.cpp34
1 files changed, 30 insertions, 4 deletions
diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp
index df5a1b5b..07e64e95 100644
--- a/src/libcamera/pipeline/ipu3/imgu.cpp
+++ b/src/libcamera/pipeline/ipu3/imgu.cpp
@@ -23,6 +23,7 @@
namespace libcamera {
LOG_DECLARE_CATEGORY(IPU3)
+LOG_DEFINE_CATEGORY(ImgUPipe)
namespace {
@@ -128,6 +129,8 @@ 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) /
@@ -135,6 +138,9 @@ 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) {
@@ -170,9 +176,15 @@ 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 };
- pipeConfigs.push_back({ bdsSF, { iif.width, foundIfHeight },
- { bdsWidth, bdsIntHeight }, gdc });
+ LOG(ImgUPipe, Debug)
+ << "IF: " << foundIf.toString()
+ << ", BDS: " << foundBds.toString()
+ << ", GDC: " << gdc.toString();
+
+ pipeConfigs.push_back({ bdsSF, foundIf, foundBds, gdc });
return;
}
} else {
@@ -185,8 +197,15 @@ void calculateBDSHeight(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc
if (!(ifHeight % IF_ALIGN_H) &&
!(bdsIntHeight % BDS_ALIGN_H)) {
- pipeConfigs.push_back({ bdsSF, { iif.width, ifHeight },
- { bdsWidth, bdsIntHeight }, gdc });
+ 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 });
}
}
@@ -264,6 +283,8 @@ Size calculateGDC(ImgUDevice::Pipe *pipe)
gdc.width = main.width * sf;
gdc.height = main.height * sf;
+ LOG(ImgUPipe, Debug) << "GDC: " << gdc.toString();
+
return gdc;
}
@@ -281,6 +302,11 @@ 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;
}