{"id":8638,"url":"https://patchwork.libcamera.org/api/1.1/patches/8638/?format=json","web_url":"https://patchwork.libcamera.org/patch/8638/","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":"<20200704133140.1738660-18-paul.elder@ideasonboard.com>","date":"2020-07-04T13:31:35","name":"[libcamera-devel,v3,17/22] libcamera: raspberrypi: Fill stride and frameSize at config validation","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"3f96fcbad71040392010f9de7a173b1e5e5b6d22","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8638/mbox/","series":[{"id":1083,"url":"https://patchwork.libcamera.org/api/1.1/series/1083/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1083","date":"2020-07-04T13:31:18","name":"Clean up formats in v4l2-compat and pipeline handlers","version":3,"mbox":"https://patchwork.libcamera.org/series/1083/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8638/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8638/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 52ED6BD792\n\tfor ;\n\tSat, 4 Jul 2020 13:32:30 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1FCAE60E3A;\n\tSat, 4 Jul 2020 15:32:30 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8F8E460E1D\n\tfor ;\n\tSat, 4 Jul 2020 15:32:28 +0200 (CEST)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 25188296;\n\tSat, 4 Jul 2020 15:32:26 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"vwZxSFjQ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593869548;\n\tbh=eZL1oxXFtGMBOz6HgEuTJTACCrF5wrmOh5vYUhYB1eo=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=vwZxSFjQZE/0NQHg0q4/U5plEce1CjdV5+5fkmcLJioCMG9ndNAXBCKErfSwJ2j7L\n\tR5yQHeo+OcJHQDB2Kz5kj7eFHJWCqwqVDUexUHlMgVvCb/bs1utVJqi56uqCoXLr83\n\tEaX3ijrERiQXX/9AzsHBfQlzdGlnI6qkuLPNYNOE=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 4 Jul 2020 22:31:35 +0900","Message-Id":"<20200704133140.1738660-18-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200704133140.1738660-1-paul.elder@ideasonboard.com>","References":"<20200704133140.1738660-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 17/22] libcamera: raspberrypi: Fill\n\tstride and frameSize at config validation","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":"Fill the stride and frameSize fields of the StreamConfiguration at\nconfiguration validation time instead of at camera configuration time.\n\nSigned-off-by: Paul Elder \n\n---\nNew in v3\n---\n src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 7 ++++---\n 1 file changed, 4 insertions(+), 3 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 18d068a..fc696ff 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -447,6 +447,10 @@ CameraConfiguration::Status RPiCameraConfiguration::validate()\n \n \t\tcount++;\n \n+\t\tconst PixelFormatInfo &info = PixelFormatInfo::info(cfg.pixelFormat);\n+\t\tcfg.stride = info.stride(cfg.size.width, 0);\n+\t\tcfg.frameSize = info.frameSize(cfg.size);\n+\n \t\t/* Can only output 1 RAW stream, or 2 YUV/RGB streams. */\n \t\tif (rawCount > 1 || outCount > 2) {\n \t\t\tLOG(RPI, Error) << \"Invalid number of streams requested\";\n@@ -655,7 +659,6 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n \n \t\tif (isRaw(cfg.pixelFormat)) {\n \t\t\tcfg.setStream(&data->isp_[Isp::Input]);\n-\t\t\tcfg.stride = sensorFormat.planes[0].bpl;\n \t\t\tdata->isp_[Isp::Input].setExternal(true);\n \t\t\tcontinue;\n \t\t}\n@@ -679,7 +682,6 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n \t\t\t}\n \n \t\t\tcfg.setStream(&data->isp_[Isp::Output0]);\n-\t\t\tcfg.stride = format.planes[0].bpl;\n \t\t\tdata->isp_[Isp::Output0].setExternal(true);\n \t\t}\n \n@@ -705,7 +707,6 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n \t\t */\n \t\tif (!cfg.stream()) {\n \t\t\tcfg.setStream(&data->isp_[Isp::Output1]);\n-\t\t\tcfg.stride = format.planes[0].bpl;\n \t\t\tdata->isp_[Isp::Output1].setExternal(true);\n \t\t}\n \t}\n","prefixes":["libcamera-devel","v3","17/22"]}