{"id":12163,"url":"https://patchwork.libcamera.org/api/patches/12163/?format=json","web_url":"https://patchwork.libcamera.org/patch/12163/","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":"<20210503092705.15562-3-jacopo@jmondi.org>","date":"2021-05-03T09:27:00","name":"[libcamera-devel,v2,2/7] libcamera: ipu3: imgu: Filter BDS by height","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"a1d212469dd0a4bcb568160112493b0588b26f64","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/12163/mbox/","series":[{"id":1993,"url":"https://patchwork.libcamera.org/api/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/12163/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12163/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 0FF74BDE78\n\tfor ;\n\tMon, 3 May 2021 09:26:30 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B7A6868927;\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 570E7602C0\n\tfor ;\n\tMon, 3 May 2021 11:26:25 +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 22E64E0009\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:27:00 +0200","Message-Id":"<20210503092705.15562-3-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 2/7] libcamera: ipu3: imgu: Filter BDS\n\tby height","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 to calculateBDS() function the content of commit 243d134 (\"Fix\nsome bug for some resolutions\") from\nhttps://github.com/intel/intel-ipu3-pipecfg.git.\n\nThe calculated BDS sizes are filtered by height and not only by width\nanymore.\n\nTested-by: Jean-Michel Hautbois \nReviewed-by: Jean-Michel Hautbois \nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/pipeline/ipu3/imgu.cpp | 20 +++++++++++++++-----\n 1 file changed, 15 insertions(+), 5 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp\nindex 8373dc165a61..36fee31c1962 100644\n--- a/src/libcamera/pipeline/ipu3/imgu.cpp\n+++ b/src/libcamera/pipeline/ipu3/imgu.cpp\n@@ -33,6 +33,7 @@ namespace {\n * at revision: 61e83f2f7606 (\"Add more information into README\")\n */\n \n+static constexpr unsigned int FILTER_W = 4;\n static constexpr unsigned int FILTER_H = 4;\n \n static constexpr unsigned int IF_ALIGN_W = 2;\n@@ -194,15 +195,20 @@ void calculateBDSHeight(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc\n \n void calculateBDS(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc, float bdsSF)\n {\n-\tunsigned int minBDSWidth = gdc.width + FILTER_H * 2;\n+\tunsigned int minBDSWidth = gdc.width + FILTER_W * 2;\n+\tunsigned int minBDSHeight = gdc.height + FILTER_H * 2;\n \n \tfloat sf = bdsSF;\n \twhile (sf <= BDS_SF_MAX && sf >= BDS_SF_MIN) {\n \t\tfloat bdsWidth = static_cast(iif.width) / sf;\n+\t\tfloat bdsHeight = static_cast(iif.height) / sf;\n \n-\t\tif (std::fmod(bdsWidth, 1.0) == 0) {\n+\t\tif (std::fmod(bdsWidth, 1.0) == 0 &&\n+\t\t std::fmod(bdsHeight, 1.0) == 0) {\n \t\t\tunsigned int bdsIntWidth = static_cast(bdsWidth);\n-\t\t\tif (!(bdsIntWidth % BDS_ALIGN_W) && bdsWidth >= minBDSWidth)\n+\t\t\tunsigned int bdsIntHeight = static_cast(bdsHeight);\n+\t\t\tif (!(bdsIntWidth % BDS_ALIGN_W) && bdsWidth >= minBDSWidth &&\n+\t\t\t !(bdsIntHeight % BDS_ALIGN_H) && bdsHeight >= minBDSHeight)\n \t\t\t\tcalculateBDSHeight(pipe, iif, gdc, bdsIntWidth, sf);\n \t\t}\n \n@@ -212,10 +218,14 @@ void calculateBDS(ImgUDevice::Pipe *pipe, const Size &iif, const Size &gdc, floa\n \tsf = bdsSF;\n \twhile (sf <= BDS_SF_MAX && sf >= BDS_SF_MIN) {\n \t\tfloat bdsWidth = static_cast(iif.width) / sf;\n+\t\tfloat bdsHeight = static_cast(iif.height) / sf;\n \n-\t\tif (std::fmod(bdsWidth, 1.0) == 0) {\n+\t\tif (std::fmod(bdsWidth, 1.0) == 0 &&\n+\t\t std::fmod(bdsHeight, 1.0) == 0) {\n \t\t\tunsigned int bdsIntWidth = static_cast(bdsWidth);\n-\t\t\tif (!(bdsIntWidth % BDS_ALIGN_W) && bdsWidth >= minBDSWidth)\n+\t\t\tunsigned int bdsIntHeight = static_cast(bdsHeight);\n+\t\t\tif (!(bdsIntWidth % BDS_ALIGN_W) && bdsWidth >= minBDSWidth &&\n+\t\t\t !(bdsIntHeight % BDS_ALIGN_H) && bdsHeight >= minBDSHeight)\n \t\t\t\tcalculateBDSHeight(pipe, iif, gdc, bdsIntWidth, sf);\n \t\t}\n \n","prefixes":["libcamera-devel","v2","2/7"]}