From patchwork Thu May 27 12:09:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 12453 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 6AC82BDB80 for ; Thu, 27 May 2021 12:08:44 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A3CBC602AE; Thu, 27 May 2021 14:08:43 +0200 (CEST) Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C885E602AA for ; Thu, 27 May 2021 14:08:42 +0200 (CEST) Received: (Authenticated sender: jacopo@jmondi.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 1B29F1C000C; Thu, 27 May 2021 12:08:41 +0000 (UTC) From: Jacopo Mondi 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 Subject: [libcamera-devel] [PATCH] Revert "libcamera: ipu3: imgu: Add pipe calculation debug" X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" This reverts commit 5b015e96ccdbcd87b4ba6484199652fec5cdb38a. The ImgU pipe configuration debug is useful to test the correctness of the parameters computation against the Intel Python script. However, the number of debug messages which is printed out by the configuration procedure is so high it floods the logs, up to the point that starting the Android camera3 HAL, which tests several configurations at startup, becomes so slow it is barely usable. Revert the patch that adds the excessive debug statements, which are mostly useful only when testing the configuration procedure. Signed-off-by: Jacopo Mondi Acked-by: Umang Jain Reviewed-by: Laurent Pinchart --- src/libcamera/pipeline/ipu3/imgu.cpp | 34 ++++------------------------ 1 file changed, 4 insertions(+), 30 deletions(-) -- 2.31.1 diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp index 6bfd23bee3ca..3e517ac67962 100644 --- a/src/libcamera/pipeline/ipu3/imgu.cpp +++ b/src/libcamera/pipeline/ipu3/imgu.cpp @@ -23,7 +23,6 @@ namespace libcamera { LOG_DECLARE_CATEGORY(IPU3) -LOG_DEFINE_CATEGORY(ImgUPipe) namespace { @@ -129,8 +128,6 @@ 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) / @@ -138,9 +135,6 @@ void calculateBDSHeight(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc estIFHeight = std::clamp(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) { @@ -176,15 +170,9 @@ void calculateBDSHeight(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc if (foundIfHeight) { unsigned int bdsIntHeight = static_cast(bdsHeight); - Size foundIf{ iif.width, foundIfHeight }; - Size foundBds{ bdsWidth, bdsIntHeight }; - LOG(ImgUPipe, Debug) - << "IF: " << foundIf.toString() - << ", BDS: " << foundBds.toString() - << ", GDC: " << gdc.toString(); - - pipeConfigs.push_back({ bdsSF, foundIf, foundBds, gdc }); + pipeConfigs.push_back({ bdsSF, { iif.width, foundIfHeight }, + { bdsWidth, bdsIntHeight }, gdc }); return; } } else { @@ -197,15 +185,8 @@ void calculateBDSHeight(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc if (!(ifHeight % IF_ALIGN_H) && !(bdsIntHeight % BDS_ALIGN_H)) { - 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 }); + pipeConfigs.push_back({ bdsSF, { iif.width, ifHeight }, + { bdsWidth, bdsIntHeight }, gdc }); } } @@ -283,8 +264,6 @@ Size calculateGDC(ImgUDevice::Pipe *pipe) gdc.width = main.width * sf; gdc.height = main.height * sf; - LOG(ImgUPipe, Debug) << "GDC: " << gdc.toString(); - return gdc; } @@ -302,11 +281,6 @@ 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; }