{"id":8730,"url":"https://patchwork.libcamera.org/api/1.1/patches/8730/?format=json","web_url":"https://patchwork.libcamera.org/patch/8730/","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":"<20200709132835.112593-16-paul.elder@ideasonboard.com>","date":"2020-07-09T13:28:27","name":"[libcamera-devel,v5,15/23] libcamera: rkisp1: Fill stride and frameSize at config validation","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"7a23270b2a4926b7ed66531519a812c869db0bbf","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/8730/mbox/","series":[{"id":1093,"url":"https://patchwork.libcamera.org/api/1.1/series/1093/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1093","date":"2020-07-09T13:28:12","name":"Clean up formats in v4l2-compat and pipeline handlers","version":5,"mbox":"https://patchwork.libcamera.org/series/1093/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8730/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8730/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 70454BD792\n\tfor ;\n\tThu, 9 Jul 2020 13:29:28 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3E73361214;\n\tThu, 9 Jul 2020 15:29:28 +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 B632D61184\n\tfor ;\n\tThu, 9 Jul 2020 15:29:26 +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 A394A56E;\n\tThu, 9 Jul 2020 15:29:24 +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=\"PoY+nJB2\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1594301366;\n\tbh=FNKiy0STbJtjjbWrtFa/JquxkdCNS3SZQvVkx9VG9KA=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=PoY+nJB2B0nsHySh4V77KdaxfxladhJQI58sV7cRCP3zluc0H2T/6JkmBUL6jzzod\n\t0nhZiUY5qEcoHpujK1KtpcZCykfUCPpmA7Tlmsp76m7gODHEAFuhWxFMsdNUTinauK\n\tz7djfN5d+SI7xW6TFGrtOgo4Koprm0faPoGJz7YY=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 9 Jul 2020 22:28:27 +0900","Message-Id":"<20200709132835.112593-16-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200709132835.112593-1-paul.elder@ideasonboard.com>","References":"<20200709132835.112593-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v5 15/23] libcamera: rkisp1: Fill stride\n\tand 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\nSigned-off-by: Paul Elder \nReviewed-by: Laurent Pinchart \n\n---\nNo change in v5\n\nChanges in v4:\n- mention motivation in commit message\n- get stride and frameSize from tryFormat on the capture video node\n\nNew in v3\n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 20 ++++++++++++++++----\n 1 file changed, 16 insertions(+), 4 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 051d77a..7ce4140 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -115,9 +115,9 @@ public:\n class RkISP1CameraData : public CameraData\n {\n public:\n-\tRkISP1CameraData(PipelineHandler *pipe)\n+\tRkISP1CameraData(PipelineHandler *pipe, V4L2VideoDevice *video)\n \t\t: CameraData(pipe), sensor_(nullptr), frame_(0),\n-\t\t frameInfo_(pipe)\n+\t\t frameInfo_(pipe), video_(video)\n \t{\n \t}\n \n@@ -135,6 +135,8 @@ public:\n \tRkISP1Frames frameInfo_;\n \tRkISP1Timeline timeline_;\n \n+\tV4L2VideoDevice *video_;\n+\n private:\n \tvoid queueFrameAction(unsigned int frame,\n \t\t\t const IPAOperationData &action);\n@@ -535,6 +537,17 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n \n \tcfg.bufferCount = RKISP1_BUFFER_COUNT;\n \n+\tV4L2DeviceFormat format = {};\n+\tformat.fourcc = data_->video_->toV4L2PixelFormat(cfg.pixelFormat);\n+\tformat.size = cfg.size;\n+\n+\tint ret = data_->video_->tryFormat(&format);\n+\tif (ret)\n+\t\treturn Invalid;\n+\n+\tcfg.stride = format.planes[0].bpl;\n+\tcfg.frameSize = format.planes[0].size;\n+\n \treturn status;\n }\n \n@@ -683,7 +696,6 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n \t\treturn ret;\n \n \tcfg.setStream(&data->stream_);\n-\tcfg.stride = outputFormat.planes[0].bpl;\n \n \treturn 0;\n }\n@@ -934,7 +946,7 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)\n \tint ret;\n \n \tstd::unique_ptr data =\n-\t\tstd::make_unique(this);\n+\t\tstd::make_unique(this, video_);\n \n \tControlInfoMap::Map ctrls;\n \tctrls.emplace(std::piecewise_construct,\n","prefixes":["libcamera-devel","v5","15/23"]}