Patch Detail
Show a patch.
GET /api/1.1/patches/12453/?format=api
{ "id": 12453, "url": "https://patchwork.libcamera.org/api/1.1/patches/12453/?format=api", "web_url": "https://patchwork.libcamera.org/patch/12453/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20210527120920.28936-1-jacopo@jmondi.org>", "date": "2021-05-27T12:09:20", "name": "[libcamera-devel] Revert \"libcamera: ipu3: imgu: Add pipe calculation debug\"", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "a2a277ad257d3ba39d01ebfb164269ea5eace5f8", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/12453/mbox/", "series": [ { "id": 2087, "url": "https://patchwork.libcamera.org/api/1.1/series/2087/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2087", "date": "2021-05-27T12:09:20", "name": "[libcamera-devel] Revert \"libcamera: ipu3: imgu: Add pipe calculation debug\"", "version": 1, "mbox": "https://patchwork.libcamera.org/series/2087/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/12453/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/12453/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 6AC82BDB80\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 27 May 2021 12:08:44 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A3CBC602AE;\n\tThu, 27 May 2021 14:08:43 +0200 (CEST)", "from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C885E602AA\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 27 May 2021 14:08:42 +0200 (CEST)", "(Authenticated sender: jacopo@jmondi.org)\n\tby relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 1B29F1C000C;\n\tThu, 27 May 2021 12:08:41 +0000 (UTC)" ], "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 27 May 2021 14:09:20 +0200", "Message-Id": "<20210527120920.28936-1-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.31.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH] Revert \"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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "This reverts commit 5b015e96ccdbcd87b4ba6484199652fec5cdb38a.\n\nThe ImgU pipe configuration debug is useful to test the correctness\nof the parameters computation against the Intel Python script.\n\nHowever, the number of debug messages which is printed out by the\nconfiguration procedure is so high it floods the logs, up to the point\nthat starting the Android camera3 HAL, which tests several configurations\nat startup, becomes so slow it is barely usable.\n\nRevert the patch that adds the excessive debug statements, which are mostly\nuseful only when testing the configuration procedure.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n\n---\n src/libcamera/pipeline/ipu3/imgu.cpp | 34 ++++------------------------\n 1 file changed, 4 insertions(+), 30 deletions(-)\n\n--\n2.31.1", "diff": "diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp\nindex 6bfd23bee3ca..3e517ac67962 100644\n--- a/src/libcamera/pipeline/ipu3/imgu.cpp\n+++ b/src/libcamera/pipeline/ipu3/imgu.cpp\n@@ -23,7 +23,6 @@\n namespace libcamera {\n\n LOG_DECLARE_CATEGORY(IPU3)\n-LOG_DEFINE_CATEGORY(ImgUPipe)\n\n namespace {\n\n@@ -129,8 +128,6 @@ 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@@ -138,9 +135,6 @@ 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@@ -176,15 +170,9 @@ 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\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\tpipeConfigs.push_back({ bdsSF, { iif.width, foundIfHeight },\n+\t\t\t\t\t\t{ bdsWidth, bdsIntHeight }, gdc });\n \t\t\treturn;\n \t\t}\n \t} else {\n@@ -197,15 +185,8 @@ 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\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\tpipeConfigs.push_back({ bdsSF, { iif.width, ifHeight },\n+\t\t\t\t\t\t\t\t{ bdsWidth, bdsIntHeight }, gdc });\n \t\t\t\t}\n \t\t\t}\n\n@@ -283,8 +264,6 @@ 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@@ -302,11 +281,6 @@ 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" ] }