{"id":9115,"url":"https://patchwork.libcamera.org/api/patches/9115/?format=json","web_url":"https://patchwork.libcamera.org/patch/9115/","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":"<20200731153320.58107-18-jacopo@jmondi.org>","date":"2020-07-31T15:33:18","name":"[libcamera-devel,v5,17/19] libcamera: ipu3: Validate the pipe configuration","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"1beb0314c16d3521420fa5c8d66640562b36797a","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/9115/mbox/","series":[{"id":1171,"url":"https://patchwork.libcamera.org/api/series/1171/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1171","date":"2020-07-31T15:33:01","name":"[libcamera-devel,v5,01/19] libcamera: ipu3: Rename mbusCodesToInfo","version":5,"mbox":"https://patchwork.libcamera.org/series/1171/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9115/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9115/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 33621BD879\n\tfor ;\n\tFri, 31 Jul 2020 15:30:13 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0B82361F3B;\n\tFri, 31 Jul 2020 17:30:13 +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 59FA460398\n\tfor ;\n\tFri, 31 Jul 2020 17:30:10 +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 2D87924000C;\n\tFri, 31 Jul 2020 15:30:08 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 31 Jul 2020 17:33:18 +0200","Message-Id":"<20200731153320.58107-18-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200731153320.58107-1-jacopo@jmondi.org>","References":"<20200731153320.58107-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v5 17/19] libcamera: ipu3: Validate the\n\tpipe configuration","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":"Collect the desired ImgU pipe configuration while assigning\nstreams in the pipeline handler validate() function and ask the\nImgUDevice class to calculate the pipe configuration parameters.\n\nIf the requested pipe configuration results in a non-valid\nconfiguration, return an error from the validate() function.\n\nReviewed-by: Laurent Pinchart \nReviewed-by: Niklas Söderlund \nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 19 +++++++++++++++++++\n 1 file changed, 19 insertions(+)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex a081a81c860c..19c6b1aba2de 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -77,6 +77,7 @@ private:\n \tconst IPU3CameraData *data_;\n \n \tStreamConfiguration cio2Configuration_;\n+\tImgUDevice::PipeConfig pipeConfig_;\n };\n \n class PipelineHandlerIPU3 : public PipelineHandler\n@@ -189,6 +190,9 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \n \tLOG(IPU3, Debug) << \"CIO2 configuration: \" << cio2Configuration_.toString();\n \n+\tImgUDevice::Pipe pipe{};\n+\tpipe.input = cio2Configuration_.size;\n+\n \t/*\n \t * Adjust the configurations if needed and assign streams while\n \t * iterating them.\n@@ -263,10 +267,15 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \t\t\t\tcfg->setStream(const_cast(&data_->outStream_));\n \t\t\t\tmainOutputAvailable = false;\n \n+\t\t\t\tpipe.main = cfg->size;\n+\t\t\t\tif (yuvCount == 1)\n+\t\t\t\t\tpipe.viewfinder = pipe.main;\n+\n \t\t\t\tLOG(IPU3, Debug) << \"Assigned \" << cfg->toString()\n \t\t\t\t\t\t << \" to the main output\";\n \t\t\t} else {\n \t\t\t\tcfg->setStream(const_cast(&data_->vfStream_));\n+\t\t\t\tpipe.viewfinder = cfg->size;\n \n \t\t\t\tLOG(IPU3, Debug) << \"Assigned \" << cfg->toString()\n \t\t\t\t\t\t << \" to the viewfinder output\";\n@@ -282,6 +291,16 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \t\t}\n \t}\n \n+\t/* Only compute the ImgU configuration if a YUV stream has been requested. */\n+\tif (yuvCount) {\n+\t\tpipeConfig_ = data_->imgu_->calculatePipeConfig(&pipe);\n+\t\tif (pipeConfig_.isNull()) {\n+\t\t\tLOG(IPU3, Error) << \"Failed to calculate pipe configuration: \"\n+\t\t\t\t\t << \"unsupported resolutions.\";\n+\t\t\treturn Invalid;\n+\t\t}\n+\t}\n+\n \treturn status;\n }\n \n","prefixes":["libcamera-devel","v5","17/19"]}