Patch Detail
Show a patch.
GET /api/patches/12278/?format=api
{ "id": 12278, "url": "https://patchwork.libcamera.org/api/patches/12278/?format=api", "web_url": "https://patchwork.libcamera.org/patch/12278/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20210513152116.17666-8-jacopo@jmondi.org>", "date": "2021-05-13T15:21:15", "name": "[libcamera-devel,v3,7/8] libcamera: ipu3: imgu: Add pipe calculation debug", "commit_ref": "5b015e96ccdbcd87b4ba6484199652fec5cdb38a", "pull_url": null, "state": "accepted", "archived": false, "hash": "7269fb0daeb17604319816866f4e2b8aa7abb987", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": { "id": 15, "url": "https://patchwork.libcamera.org/api/users/15/?format=api", "username": "jmondi", "first_name": "Jacopo", "last_name": "Mondi", "email": "jacopo@jmondi.org" }, "mbox": "https://patchwork.libcamera.org/patch/12278/mbox/", "series": [ { "id": 2026, "url": "https://patchwork.libcamera.org/api/series/2026/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2026", "date": "2021-05-13T15:21:08", "name": "ipu3: imgu: Improve ImgU calculation procedure", "version": 3, "mbox": "https://patchwork.libcamera.org/series/2026/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/12278/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/12278/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 901C7C31F1\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 13 May 2021 15:20:50 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 229CC68926;\n\tThu, 13 May 2021 17:20:50 +0200 (CEST)", "from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net\n\t[217.70.183.198])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B3F24688E4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 13 May 2021 17:20:47 +0200 (CEST)", "from uno.homenet.telecomitalia.it\n\t(host-79-53-131-195.retail.telecomitalia.it [79.53.131.195])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay6-d.mail.gandi.net (Postfix) with ESMTPSA id E8E90C0013;\n\tThu, 13 May 2021 15:20:45 +0000 (UTC)" ], "X-Originating-IP": "79.53.131.195", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 13 May 2021 17:21:15 +0200", "Message-Id": "<20210513152116.17666-8-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.31.1", "In-Reply-To": "<20210513152116.17666-1-jacopo@jmondi.org>", "References": "<20210513152116.17666-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v3 7/8] 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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "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\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\nTested-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>\nReviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nReviewed-by: Hirokazu Honda <hiroh@chromium.org>\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 df5a1b5b0826..07e64e957999 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 foundIfHeight = 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<float>(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@@ -170,9 +176,15 @@ void calculateBDSHeight(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc\n \n \t\tif (foundIfHeight) {\n \t\t\tunsigned int bdsIntHeight = static_cast<unsigned int>(bdsHeight);\n+\t\t\tSize foundIf{ iif.width, foundIfHeight };\n+\t\t\tSize foundBds{ bdsWidth, bdsIntHeight };\n \n-\t\t\tpipeConfigs.push_back({ bdsSF, { iif.width, foundIfHeight },\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@@ -185,8 +197,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@@ -264,6 +283,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@@ -281,6 +302,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", "v3", "7/8" ] }