{"id":12162,"url":"https://patchwork.libcamera.org/api/1.1/patches/12162/?format=json","web_url":"https://patchwork.libcamera.org/patch/12162/","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-2-jacopo@jmondi.org>","date":"2021-05-03T09:26:59","name":"[libcamera-devel,v2,1/7] libcamera: ipu3: imgu: Update BDS calculation process","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"120734c53c29620a5b3496684c41ba13392d2c1a","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/12162/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/12162/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12162/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 9B40FBDE78\n\tfor ;\n\tMon, 3 May 2021 09:26:28 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 470FD6891F;\n\tMon, 3 May 2021 11:26:26 +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 EC4A5688E4\n\tfor ;\n\tMon, 3 May 2021 11:26:24 +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 B8A5CE0006\n\tfor ;\n\tMon, 3 May 2021 09:26:24 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 3 May 2021 11:26:59 +0200","Message-Id":"<20210503092705.15562-2-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 1/7] libcamera: ipu3: imgu: Update BDS\n\tcalculation process","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":"Apply the last three hunks of commit 243d134 (\"Fix some bug for some\nresolutions\") from https://github.com/intel/intel-ipu3-pipecfg.git\nto the BDS calculation procedure.\n\nThe BDS calculation is now perfomed by scaling both width and height,\nand repeated by scaling width first.\n\nTested-by: Jean-Michel Hautbois \nReviewed-by: Jean-Michel Hautbois \nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/pipeline/ipu3/imgu.cpp | 34 ++++++++++++++++++++++++----\n 1 file changed, 29 insertions(+), 5 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp\nindex d5cf05b0c421..8373dc165a61 100644\n--- a/src/libcamera/pipeline/ipu3/imgu.cpp\n+++ b/src/libcamera/pipeline/ipu3/imgu.cpp\n@@ -394,19 +394,43 @@ ImgUDevice::PipeConfig ImgUDevice::calculatePipeConfig(Pipe *pipe)\n \tconst Size &in = pipe->input;\n \tSize gdc = calculateGDC(pipe);\n \n-\tunsigned int ifWidth = utils::alignUp(in.width, IF_ALIGN_W);\n-\tunsigned int ifHeight = in.height;\n-\tunsigned int minIfWidth = in.width - IF_CROP_MAX_W;\n \tfloat bdsSF = static_cast(in.width) / gdc.width;\n \tfloat sf = findScaleFactor(bdsSF, bdsScalingFactors, true);\n \n+\t/* Populate the configurations vector by scaling width and height. */\n+\tunsigned int ifWidth = utils::alignUp(in.width, IF_ALIGN_W);\n+\tunsigned int ifHeight = utils::alignUp(in.height, IF_ALIGN_H);\n+\tunsigned int minIfWidth = in.width - IF_CROP_MAX_W;\n+\tunsigned int minIfHeight = in.height - IF_CROP_MAX_H;\n \twhile (ifWidth >= minIfWidth) {\n-\t\tSize iif{ ifWidth, ifHeight };\n-\t\tcalculateBDS(pipe, iif, gdc, sf);\n+\t\twhile (ifHeight >= minIfHeight) {\n+\t\t\tSize iif{ ifWidth, ifHeight };\n+\t\t\tcalculateBDS(pipe, iif, gdc, sf);\n+\t\t\tifHeight -= IF_ALIGN_H;\n+\t\t}\n \n \t\tifWidth -= IF_ALIGN_W;\n \t}\n \n+\t/* Repeat search by scaling width first. */\n+\tifWidth = utils::alignUp(in.width, IF_ALIGN_W);\n+\tifHeight = utils::alignUp(in.height, IF_ALIGN_H);\n+\tminIfWidth = in.width - IF_CROP_MAX_W;\n+\tminIfHeight = in.height - IF_CROP_MAX_H;\n+\twhile (ifHeight >= minIfHeight) {\n+\t\t/*\n+\t\t * \\todo This procedure is probably broken:\n+\t\t * https://github.com/intel/intel-ipu3-pipecfg/issues/2\n+\t\t */\n+\t\twhile (ifWidth >= minIfWidth) {\n+\t\t\tSize iif{ ifWidth, ifHeight };\n+\t\t\tcalculateBDS(pipe, iif, gdc, sf);\n+\t\t\tifWidth -= IF_ALIGN_W;\n+\t\t}\n+\n+\t\tifHeight -= IF_ALIGN_H;\n+\t}\n+\n \tif (pipeConfigs.size() == 0) {\n \t\tLOG(IPU3, Error) << \"Failed to calculate pipe configuration\";\n \t\treturn {};\n","prefixes":["libcamera-devel","v2","1/7"]}