{"id":8786,"url":"https://patchwork.libcamera.org/api/patches/8786/?format=json","web_url":"https://patchwork.libcamera.org/patch/8786/","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":"<20200714104212.48683-12-jacopo@jmondi.org>","date":"2020-07-14T10:42:03","name":"[libcamera-devel,11/20] libcamera: ipu3: Validate the stream combination","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"d5b1316c532d95a1f7013980ed0f449e2d75be52","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8786/mbox/","series":[{"id":1104,"url":"https://patchwork.libcamera.org/api/series/1104/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1104","date":"2020-07-14T10:41:52","name":"libcamera: ipu3: Rework pipe configuration","version":1,"mbox":"https://patchwork.libcamera.org/series/1104/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8786/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8786/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 F05A9BD792\n\tfor ;\n\tTue, 14 Jul 2020 10:38:58 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B42F86090C;\n\tTue, 14 Jul 2020 12:38:58 +0200 (CEST)","from relay10.mail.gandi.net (relay10.mail.gandi.net\n\t[217.70.178.230])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 061F6605B2\n\tfor ;\n\tTue, 14 Jul 2020 12:38:56 +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 relay10.mail.gandi.net (Postfix) with ESMTPSA id 44B2924000F;\n\tTue, 14 Jul 2020 10:38:55 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 14 Jul 2020 12:42:03 +0200","Message-Id":"<20200714104212.48683-12-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200714104212.48683-1-jacopo@jmondi.org>","References":"<20200714104212.48683-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 11/20] libcamera: ipu3: Validate the\n\tstream combination","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 IPU3 pipeline handler supports 2 processed RGB/YUV streams\nand one RAW stream. Validate that the requested stream combination is\nsupported in the pipeline handler validate() implementation and return\nan error in case it's not.\n\nReviewed-by: Laurent Pinchart \nReviewed-by: Niklas Söderlund \nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 23 +++++++++++++++++++----\n 1 file changed, 19 insertions(+), 4 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 6a93a48c2402..19e07fd57e39 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -241,19 +241,34 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \t}\n \n \t/*\n-\t * Select the sensor format by collecting the maximum width and height\n-\t * and picking the closest larger match, as the IPU3 can downscale\n-\t * only. If no resolution is requested for any stream, or if no sensor\n-\t * resolution is large enough, pick the largest one.\n+\t * Validate the requested stream configuration and select the sensor\n+\t * format by collecting the maximum width and height and picking the\n+\t * closest larger match, as the IPU3 can downscale only. If no\n+\t * resolution is requested for any stream, or if no sensor resolution is\n+\t * large enough, pick the largest one.\n \t */\n+\tunsigned int rawCount = 0;\n+\tunsigned int yuvCount = 0;\n \tSize size;\n \n \tfor (const StreamConfiguration &cfg : config_) {\n+\t\tconst PixelFormatInfo &info = PixelFormatInfo::info(cfg.pixelFormat);\n+\n+\t\tif (info.colourEncoding == PixelFormatInfo::ColourEncodingRAW)\n+\t\t\trawCount++;\n+\t\telse\n+\t\t\tyuvCount++;\n+\n \t\tif (cfg.size.width > size.width)\n \t\t\tsize.width = cfg.size.width;\n \t\tif (cfg.size.height > size.height)\n \t\t\tsize.height = cfg.size.height;\n \t}\n+\tif (rawCount > 1 || yuvCount > 2) {\n+\t\tLOG(IPU3, Debug)\n+\t\t\t<< \"Camera configuration not supported\";\n+\t\treturn Invalid;\n+\t}\n \n \t/* Generate raw configuration from CIO2. */\n \tcio2Configuration_ = data_->cio2_.generateConfiguration(size);\n","prefixes":["libcamera-devel","11/20"]}