{"id":8534,"url":"https://patchwork.libcamera.org/api/1.1/patches/8534/?format=json","web_url":"https://patchwork.libcamera.org/patch/8534/","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":"<20200701123036.51922-8-jacopo@jmondi.org>","date":"2020-07-01T12:30:28","name":"[libcamera-devel,07/15] libcamera: ipu3: Refuse unsupported configuration","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"ffa3049aa8055e046fa384b91f4d8eede5140243","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/8534/mbox/","series":[{"id":1066,"url":"https://patchwork.libcamera.org/api/1.1/series/1066/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1066","date":"2020-07-01T12:30:21","name":"libcamera: ipu3: Rework streams configuration","version":1,"mbox":"https://patchwork.libcamera.org/series/1066/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8534/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8534/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 86A5EBF415\n\tfor ;\n\tWed, 1 Jul 2020 12:27:26 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4986560C59;\n\tWed, 1 Jul 2020 14:27:26 +0200 (CEST)","from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5415460C53\n\tfor ;\n\tWed, 1 Jul 2020 14:27:23 +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 relay5-d.mail.gandi.net (Postfix) with ESMTPSA id EBA581C0009;\n\tWed, 1 Jul 2020 12:27:22 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 1 Jul 2020 14:30:28 +0200","Message-Id":"<20200701123036.51922-8-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200701123036.51922-1-jacopo@jmondi.org>","References":"<20200701123036.51922-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 07/15] libcamera: ipu3: Refuse unsupported\n\tconfiguration","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":"Make sure in the validate() function that the number of raw and\nprocessed streams requested by applications is supported by the\nplatform.\n\nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 11 +++++++++++\n 1 file changed, 11 insertions(+)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex daa6d71dae72..651e0c93a7ab 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -213,6 +213,8 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \tassignStreams();\n \n \t/* Verify and adjust configuration if needed. */\n+\tunsigned int rawCount = 0;\n+\tunsigned int outCount = 0;\n \tfor (unsigned int i = 0; i < config_.size(); ++i) {\n \t\tStreamConfiguration &cfg = config_[i];\n \t\tconst StreamConfiguration oldCfg = cfg;\n@@ -223,6 +225,7 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \t\t\tcfg.size = cio2Configuration_.size;\n \t\t\tcfg.pixelFormat = cio2Configuration_.pixelFormat;\n \t\t\tcfg.bufferCount = cio2Configuration_.bufferCount;\n+\t\t\trawCount++;\n \t\t} else {\n \t\t\t/*\n \t\t\t * Clamp the size to match the ImgU alignment\n@@ -242,6 +245,7 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \t\t\t}\n \t\t\tcfg.pixelFormat = formats::NV12;\n \t\t\tcfg.bufferCount = IPU3_BUFFER_COUNT;\n+\t\t\toutCount++;\n \n \t\t\t/*\n \t\t\t * \\todo: Handle the scaler (BDS) restrictions. The BDS\n@@ -254,6 +258,13 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \t\t\t */\n \t\t}\n \n+\t\tif (rawCount > 1 || outCount > 2) {\n+\t\t\tLOG(IPU3, Error)\n+\t\t\t\t<< \"Camera configuration not supported: \"\n+\t\t\t\t<< \"the platform supports up to one raw stream and two processed ones.\";\n+\t\t\treturn Invalid;\n+\t\t}\n+\n \t\tif (cfg.pixelFormat != oldCfg.pixelFormat || cfg.size != oldCfg.size) {\n \t\t\tLOG(IPU3, Debug)\n \t\t\t\t<< \"Stream \" << i << \" configuration adjusted to \"\n","prefixes":["libcamera-devel","07/15"]}