{"id":12167,"url":"https://patchwork.libcamera.org/api/1.1/patches/12167/?format=json","web_url":"https://patchwork.libcamera.org/patch/12167/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210503092705.15562-7-jacopo@jmondi.org>","date":"2021-05-03T09:27:04","name":"[libcamera-devel,v2,6/7] libcamera: ipu3: imgu: Add pipe calculation debug","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"1d9a1f1a1acac755b6cda257fbd424a7abcbbd41","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/1.1/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/12167/mbox/","series":[{"id":1993,"url":"https://patchwork.libcamera.org/api/1.1/series/1993/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1993","date":"2021-05-03T09:26:58","name":"ipu3: imgu: Improve ImgU calculation procedure","version":2,"mbox":"https://patchwork.libcamera.org/series/1993/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12167/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12167/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 7DC00BDE78\n\tfor ;\n\tMon, 3 May 2021 09:26:31 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DAA2868925;\n\tMon, 3 May 2021 11:26:29 +0200 (CEST)","from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net\n\t[217.70.183.196])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CB2156892A\n\tfor ;\n\tMon, 3 May 2021 11:26:26 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 99BF1E0003\n\tfor ;\n\tMon, 3 May 2021 09:26:26 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 3 May 2021 11:27:04 +0200","Message-Id":"<20210503092705.15562-7-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210503092705.15562-1-jacopo@jmondi.org>","References":"<20210503092705.15562-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 6/7] libcamera: ipu3: imgu: Add pipe\n\tcalculation debug","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add pipe calculation debug with a new associated log category.\n\nThis helps compare the pipe calculation with the one performed by the\npython script.\n\nTested-by: Jean-Michel Hautbois \nReviewed-by: Jean-Michel Hautbois \nReviewed-by: Laurent Pinchart \nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/pipeline/ipu3/imgu.cpp | 34 ++++++++++++++++++++++++----\n 1 file changed, 30 insertions(+), 4 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp\nindex fa8cf7eeef19..c874a07e8da6 100644\n--- a/src/libcamera/pipeline/ipu3/imgu.cpp\n+++ b/src/libcamera/pipeline/ipu3/imgu.cpp\n@@ -23,6 +23,7 @@\n namespace libcamera {\n \n LOG_DECLARE_CATEGORY(IPU3)\n+LOG_DEFINE_CATEGORY(ImgUPipe)\n \n namespace {\n \n@@ -128,6 +129,8 @@ void calculateBDSHeight(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc\n \tunsigned int ifHeight;\n \tfloat bdsHeight;\n \n+\tLOG(ImgUPipe, Debug) << \"BDS sf: \" << bdsSF << \", BDS width: \" << bdsWidth;\n+\n \tif (!isSameRatio(pipe->input, gdc)) {\n \t\tunsigned int foundIfHeights[2] = { 0, 0 };\n \t\tfloat estIFHeight = (iif.width * gdc.height) /\n@@ -135,6 +138,9 @@ void calculateBDSHeight(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc\n \t\testIFHeight = std::clamp(estIFHeight, minIFHeight, iif.height);\n \n \t\tifHeight = utils::alignUp(estIFHeight, IF_ALIGN_H);\n+\t\tLOG(ImgUPipe, Debug) << \"Estimated IF Height: \" << estIFHeight\n+\t\t\t\t << \", IF Height: \" << ifHeight;\n+\n \t\twhile (ifHeight >= minIFHeight && ifHeight <= iif.height &&\n \t\t ifHeight / bdsSF >= minBDSHeight) {\n \n@@ -175,9 +181,15 @@ void calculateBDSHeight(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc\n \n \t\tif (foundIfHeights[0] || foundIfHeights[1]) {\n \t\t\tunsigned int bdsIntHeight = static_cast(bdsHeight);\n+\t\t\tSize foundIf{ iif.width, ifHeight };\n+\t\t\tSize foundBds{ bdsWidth, bdsIntHeight };\n \n-\t\t\tpipeConfigs.push_back({ bdsSF, { iif.width, ifHeight },\n-\t\t\t\t\t\t{ bdsWidth, bdsIntHeight }, gdc });\n+\t\t\tLOG(ImgUPipe, Debug)\n+\t\t\t\t<< \"IF: \" << foundIf.toString()\n+\t\t\t\t<< \", BDS: \" << foundBds.toString()\n+\t\t\t\t<< \", GDC: \" << gdc.toString();\n+\n+\t\t\tpipeConfigs.push_back({ bdsSF, foundIf, foundBds, gdc });\n \t\t\treturn;\n \t\t}\n \t} else {\n@@ -190,8 +202,15 @@ void calculateBDSHeight(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc\n \n \t\t\t\tif (!(ifHeight % IF_ALIGN_H) &&\n \t\t\t\t !(bdsIntHeight % BDS_ALIGN_H)) {\n-\t\t\t\t\tpipeConfigs.push_back({ bdsSF, { iif.width, ifHeight },\n-\t\t\t\t\t\t\t\t{ bdsWidth, bdsIntHeight }, gdc });\n+\t\t\t\t\tSize foundIf{ iif.width, ifHeight };\n+\t\t\t\t\tSize foundBds{ bdsWidth, bdsIntHeight };\n+\n+\t\t\t\t\tLOG(ImgUPipe, Debug)\n+\t\t\t\t\t\t<< \"IF: \" << foundIf.toString()\n+\t\t\t\t\t\t<< \", BDS: \" << foundBds.toString()\n+\t\t\t\t\t\t<< \", GDC: \" << gdc.toString();\n+\n+\t\t\t\t\tpipeConfigs.push_back({ bdsSF, foundIf, foundBds, gdc });\n \t\t\t\t}\n \t\t\t}\n \n@@ -269,6 +288,8 @@ Size calculateGDC(ImgUDevice::Pipe *pipe)\n \tgdc.width = main.width * sf;\n \tgdc.height = main.height * sf;\n \n+\tLOG(ImgUPipe, Debug) << \"GDC: \" << gdc.toString();\n+\n \treturn gdc;\n }\n \n@@ -286,6 +307,11 @@ FOV calcFOV(const Size &in, const ImgUDevice::PipeConfig &pipe)\n \tfov.w = (inW - (ifCropW + gdcCropW)) / inW;\n \tfov.h = (inH - (ifCropH + gdcCropH)) / inH;\n \n+\tLOG(ImgUPipe, Debug)\n+\t\t<< \"IF (\" << pipe.iif.toString() << \") - BDS (\"\n+\t\t<< pipe.bds.toString() << \") - GDC (\" << pipe.gdc.toString()\n+\t\t<< \") -> FOV: \" << fov.w << \"x\" << fov.h;\n+\n \treturn fov;\n }\n \n","prefixes":["libcamera-devel","v2","6/7"]}