{"id":8684,"url":"https://patchwork.libcamera.org/api/1.1/patches/8684/?format=json","web_url":"https://patchwork.libcamera.org/patch/8684/","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":"<20200708134417.67747-16-paul.elder@ideasonboard.com>","date":"2020-07-08T13:44:11","name":"[libcamera-devel,v4,15/21] libcamera: raspberrypi: Fill stride and frameSize at config validation","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"21cf8e5a2f26887cc964b9e6d6fb0d672cb55017","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/8684/mbox/","series":[{"id":1090,"url":"https://patchwork.libcamera.org/api/1.1/series/1090/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1090","date":"2020-07-08T13:43:56","name":"Clean up formats in v4l2-compat and pipeline handlers","version":4,"mbox":"https://patchwork.libcamera.org/series/1090/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8684/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8684/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 8C279BD792\n\tfor ;\n\tWed, 8 Jul 2020 13:45:03 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 55A5A6114A;\n\tWed, 8 Jul 2020 15:45:03 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id EE30A6112A\n\tfor ;\n\tWed, 8 Jul 2020 15:45:01 +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 7C26651B;\n\tWed, 8 Jul 2020 15:45:00 +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=\"o2vN9I14\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1594215901;\n\tbh=vQsDGd/vlGY2JqCV6yA6cuhDncpUCfqX0sYfP5+q8fM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=o2vN9I149UJYxXeogTh1cuINchK1a3KJahtpzYP6lIHKYnd3UZKcNn2aBVCGL2UjZ\n\tNFJQqUz8kYlSRz4x0iw+kJUiF4Ee7R1sFfKK670bjf9BpcIq1+oNTzMinqP60Vnk1U\n\tLD0ZK+8Dvudb+tZT4xo3M2zw/jBpngI2vxGCiDys=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 8 Jul 2020 22:44:11 +0900","Message-Id":"<20200708134417.67747-16-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200708134417.67747-1-paul.elder@ideasonboard.com>","References":"<20200708134417.67747-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 15/21] 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.\nThis allows applications to get the stride when trying a configuration\nwithout modifying the active configuration of the camera.\n\nAlso set a default configuration size, in case the size is zero.\n\nSigned-off-by: Paul Elder \n\n---\nChanges in v4:\n- mention motivation in commit message\n- also fill stride and frameSize in the default format\n\nNew in v3\n---\n .../pipeline/raspberrypi/raspberrypi.cpp | 45 +++++++++++++++----\n 1 file changed, 37 insertions(+), 8 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 1822ac9..d0ce446 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -427,6 +427,10 @@ CameraConfiguration::Status RPiCameraConfiguration::validate()\n \t\t\t */\n \t\t\tV4L2PixFmtMap fmts = data_->unicam_[Unicam::Image].dev()->formats();\n \t\t\tV4L2DeviceFormat sensorFormat = findBestMode(fmts, cfg.size);\n+\t\t\tint ret = data_->unicam_[Unicam::Image].dev()->tryFormat(&sensorFormat);\n+\t\t\tif (ret)\n+\t\t\t\treturn Invalid;\n+\n \t\t\tPixelFormat sensorPixFormat = sensorFormat.fourcc.toPixelFormat();\n \t\t\tif (cfg.size != sensorFormat.size ||\n \t\t\t cfg.pixelFormat != sensorPixFormat) {\n@@ -434,6 +438,10 @@ CameraConfiguration::Status RPiCameraConfiguration::validate()\n \t\t\t\tcfg.pixelFormat = sensorPixFormat;\n \t\t\t\tstatus = Adjusted;\n \t\t\t}\n+\n+\t\t\tcfg.stride = sensorFormat.planes[0].bpl;\n+\t\t\tcfg.frameSize = sensorFormat.planes[0].size;\n+\n \t\t\trawCount++;\n \t\t} else {\n \t\t\toutSize[outCount] = std::make_pair(count, cfg.size);\n@@ -478,19 +486,43 @@ CameraConfiguration::Status RPiCameraConfiguration::validate()\n \t\t * have that fixed up in the code above.\n \t\t *\n \t\t */\n-\t\tPixelFormat &cfgPixFmt = config_.at(outSize[i].first).pixelFormat;\n+\t\tStreamConfiguration &cfg = config_.at(outSize[i].first);\n+\t\tPixelFormat &cfgPixFmt = cfg.pixelFormat;\n+\t\tV4L2VideoDevice *dev;\n \t\tV4L2PixFmtMap fmts;\n \n-\t\tif (i == maxIndex)\n-\t\t\tfmts = data_->isp_[Isp::Output0].dev()->formats();\n-\t\telse\n-\t\t\tfmts = data_->isp_[Isp::Output1].dev()->formats();\n+\t\tif (i == maxIndex) {\n+\t\t\tdev = data_->isp_[Isp::Output0].dev();\n+\t\t\tfmts = dev->formats();\n+\t\t} else {\n+\t\t\tdev = data_->isp_[Isp::Output1].dev();\n+\t\t\tfmts = dev->formats();\n+\t\t}\n \n \t\tif (fmts.find(V4L2PixelFormat::fromPixelFormat(cfgPixFmt, false)) == fmts.end()) {\n \t\t\t/* If we cannot find a native format, use a default one. */\n \t\t\tcfgPixFmt = formats::NV12;\n+\n+\t\t\tconst PixelFormatInfo &info = PixelFormatInfo::info(cfgPixFmt);\n+\t\t\tcfg.size.width = 1920;\n+\t\t\tcfg.size.height = 1080;\n+\t\t\tcfg.stride = info.stride(cfg.size.width, 0);\n+\t\t\tcfg.frameSize = info.frameSize(cfg.size);\n+\n \t\t\tstatus = Adjusted;\n \t\t}\n+\n+\t\tV4L2DeviceFormat format = {};\n+\t\tformat.fourcc = dev->toV4L2PixelFormat(cfg.pixelFormat);\n+\t\tformat.size = cfg.size;\n+\n+\t\tint ret = dev->tryFormat(&format);\n+\t\tif (ret)\n+\t\t\treturn Invalid;\n+\n+\t\tcfg.stride = format.planes[0].bpl;\n+\t\tcfg.frameSize = format.planes[0].size;\n+\n \t}\n \n \treturn status;\n@@ -655,7 +687,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 +710,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 +735,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","v4","15/21"]}