{"id":12275,"url":"https://patchwork.libcamera.org/api/1.1/patches/12275/?format=json","web_url":"https://patchwork.libcamera.org/patch/12275/","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":"<20210513152116.17666-5-jacopo@jmondi.org>","date":"2021-05-13T15:21:12","name":"[libcamera-devel,v3,4/8] libcamera: ipu3: imgu: Fix BDS height calculation","commit_ref":"630c83f82a6dfcac749469be62599b72c250b063","pull_url":null,"state":"accepted","archived":false,"hash":"0b55dd82780721d1f7aabcff1d73b11a60ee7bd5","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/12275/mbox/","series":[{"id":2026,"url":"https://patchwork.libcamera.org/api/1.1/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/12275/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12275/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 8AB70C31F1\n\tfor ;\n\tThu, 13 May 2021 15:20:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 59E1868925;\n\tThu, 13 May 2021 17:20:44 +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 5818068909\n\tfor ;\n\tThu, 13 May 2021 17:20:42 +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 CEEAAC0002;\n\tThu, 13 May 2021 15:20:40 +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:12 +0200","Message-Id":"<20210513152116.17666-5-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 4/8] libcamera: ipu3: imgu: Fix BDS\n\theight calculation","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":"The IF rectangle height is iteratively computed by first subtracting\nthe scaling factor to the estimated height, then in a successive loop\nby adding the same scaling factor until the maximum IF size is not\nreached.\n\nAs the computed IF height is not cached in any variable, the second\nloop over-writes the result of the first one, even if the BDS alignment\ncondition is not satisfied.\n\nFix this by caching the result of the two iterations, and use the one\nthat produced any result, with a preference for the one produced by the\nsecond loop, as implemented in the reference python script.\n\nSigned-off-by: Jacopo Mondi \nTested-by: Jean-Michel Hautbois \nReviewed-by: Jean-Michel Hautbois \nReviewed-by: Laurent Pinchart \nReviewed-by: Niklas Söderlund \n---\n src/libcamera/pipeline/ipu3/imgu.cpp | 10 +++++-----\n 1 file changed, 5 insertions(+), 5 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp\nindex d878a029ad84..a325b787d916 100644\n--- a/src/libcamera/pipeline/ipu3/imgu.cpp\n+++ b/src/libcamera/pipeline/ipu3/imgu.cpp\n@@ -129,10 +129,10 @@ void calculateBDSHeight(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc\n \tfloat bdsHeight;\n \n \tif (!isSameRatio(pipe->input, gdc)) {\n+\t\tunsigned int foundIfHeight = 0;\n \t\tfloat estIFHeight = (iif.width * gdc.height) /\n \t\t\t\t static_cast(gdc.width);\n \t\testIFHeight = std::clamp(estIFHeight, minIFHeight, iif.height);\n-\t\tbool found = false;\n \n \t\tifHeight = utils::alignUp(estIFHeight, IF_ALIGN_H);\n \t\twhile (ifHeight >= minIFHeight && ifHeight / bdsSF >= minBDSHeight) {\n@@ -142,7 +142,7 @@ void calculateBDSHeight(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc\n \t\t\t\tunsigned int bdsIntHeight = static_cast(bdsHeight);\n \n \t\t\t\tif (!(bdsIntHeight % BDS_ALIGN_H)) {\n-\t\t\t\t\tfound = true;\n+\t\t\t\t\tfoundIfHeight = ifHeight;\n \t\t\t\t\tbreak;\n \t\t\t\t}\n \t\t\t}\n@@ -158,7 +158,7 @@ void calculateBDSHeight(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc\n \t\t\t\tunsigned int bdsIntHeight = static_cast(bdsHeight);\n \n \t\t\t\tif (!(bdsIntHeight % BDS_ALIGN_H)) {\n-\t\t\t\t\tfound = true;\n+\t\t\t\t\tfoundIfHeight = ifHeight;\n \t\t\t\t\tbreak;\n \t\t\t\t}\n \t\t\t}\n@@ -166,10 +166,10 @@ void calculateBDSHeight(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc\n \t\t\tifHeight += IF_ALIGN_H;\n \t\t}\n \n-\t\tif (found) {\n+\t\tif (foundIfHeight) {\n \t\t\tunsigned int bdsIntHeight = static_cast(bdsHeight);\n \n-\t\t\tpipeConfigs.push_back({ bdsSF, { iif.width, ifHeight },\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","prefixes":["libcamera-devel","v3","4/8"]}