{"id":8699,"url":"https://patchwork.libcamera.org/api/1.1/patches/8699/?format=json","web_url":"https://patchwork.libcamera.org/patch/8699/","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":"<20200709084128.5316-9-jacopo@jmondi.org>","date":"2020-07-09T08:41:16","name":"[libcamera-devel,v2,08/20] libcamera: ipu3: Validate the stream combination","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"fcf9998cacee731a3a18a279dc45e919fd22a595","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8699/mbox/","series":[{"id":1091,"url":"https://patchwork.libcamera.org/api/1.1/series/1091/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1091","date":"2020-07-09T08:41:08","name":"libcamera: ipu3: Rework configuration","version":2,"mbox":"https://patchwork.libcamera.org/series/1091/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8699/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8699/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 AC74CBD790\n\tfor ;\n\tThu, 9 Jul 2020 08:38:14 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 854E9611A7;\n\tThu, 9 Jul 2020 10:38:14 +0200 (CEST)","from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F202661189\n\tfor ;\n\tThu, 9 Jul 2020 10:38:11 +0200 (CEST)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay11.mail.gandi.net (Postfix) with ESMTPSA id 31A36100015;\n\tThu, 9 Jul 2020 08:38:10 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 9 Jul 2020 10:41:16 +0200","Message-Id":"<20200709084128.5316-9-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200709084128.5316-1-jacopo@jmondi.org>","References":"<20200709084128.5316-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 08/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=\"us-ascii\"","Content-Transfer-Encoding":"7bit","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\nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 26 ++++++++++++++++++++++----\n 1 file changed, 22 insertions(+), 4 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 05e10ebb1a7d..9128e42d42ed 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -240,19 +240,37 @@ 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 outCount = 0;\n \tSize size;\n \n \tfor (const StreamConfiguration &cfg : config_) {\n+\t\tconst PixelFormatInfo &info =\n+\t\t\tPixelFormatInfo::info(cfg.pixelFormat);\n+\n+\t\tif (info.colourEncoding == PixelFormatInfo::ColourEncodingRAW)\n+\t\t\trawCount++;\n+\t\telse\n+\t\t\toutCount++;\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 || outCount > 2) {\n+\t\tLOG(IPU3, Error)\n+\t\t\t<< \"Camera configuration not supported: \"\n+\t\t\t<< \"the platform supports up to one raw stream and \"\n+\t\t\t<< \"two processed ones.\";\n+\t\treturn Invalid;\n+\t}\n \n \t/* Generate raw configuration from CIO2. */\n \tcio2Configuration_ = data_->cio2_.generateConfiguration(size);\n","prefixes":["libcamera-devel","v2","08/20"]}