{"id":12272,"url":"https://patchwork.libcamera.org/api/patches/12272/?format=json","web_url":"https://patchwork.libcamera.org/patch/12272/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20210513152116.17666-2-jacopo@jmondi.org>","date":"2021-05-13T15:21:09","name":"[libcamera-devel,v3,1/8] libcamera: ipu3: imgu: Update BDS calculation process","commit_ref":"92411679b1197754e29dd4824de8533f482f7c07","pull_url":null,"state":"accepted","archived":false,"hash":"92ab30cde649a304a91ff313f0821bb81268a93c","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/12272/mbox/","series":[{"id":2026,"url":"https://patchwork.libcamera.org/api/series/2026/?format=json","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/12272/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12272/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 75380C31F1\n\tfor ;\n\tThu, 13 May 2021 15:20:40 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3F62568923;\n\tThu, 13 May 2021 17:20:40 +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 2B97D688E4\n\tfor ;\n\tThu, 13 May 2021 17:20:38 +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 B77F5C0005;\n\tThu, 13 May 2021 15:20:36 +0000 (UTC)"],"X-Originating-IP":"79.53.131.195","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 13 May 2021 17:21:09 +0200","Message-Id":"<20210513152116.17666-2-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 1/8] 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=\"utf-8\"","Content-Transfer-Encoding":"base64","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\nSigned-off-by: Jacopo Mondi \nTested-by: Jean-Michel Hautbois \nReviewed-by: Jean-Michel Hautbois \nAcked-by: Niklas Söderlund \n---\n src/libcamera/pipeline/ipu3/imgu.cpp | 36 ++++++++++++++++++++++++----\n 1 file changed, 31 insertions(+), 5 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp\nindex d5cf05b0c421..acc625ab0fac 100644\n--- a/src/libcamera/pipeline/ipu3/imgu.cpp\n+++ b/src/libcamera/pipeline/ipu3/imgu.cpp\n@@ -394,19 +394,45 @@ 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 = std::min(IF_ALIGN_W,\n+\t\t\t\t\t in.width - IF_CROP_MAX_W);\n+\tunsigned int minIfHeight = std::min(IF_ALIGN_H,\n+\t\t\t\t\t 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 = std::min(IF_ALIGN_W, in.width - IF_CROP_MAX_W);\n+\tminIfHeight = std::min(IF_ALIGN_H, 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","v3","1/8"]}