{"id":8687,"url":"https://patchwork.libcamera.org/api/patches/8687/?format=json","web_url":"https://patchwork.libcamera.org/patch/8687/","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":"<20200708134417.67747-19-paul.elder@ideasonboard.com>","date":"2020-07-08T13:44:14","name":"[libcamera-devel,v4,18/21] libcamera: uvcvideo: Fill stride and frameSize at config validation","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"7c66381c4869a40446872a0ddfe89d7610b83fdb","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8687/mbox/","series":[{"id":1090,"url":"https://patchwork.libcamera.org/api/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/8687/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8687/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 C0C96BD792\n\tfor ;\n\tWed, 8 Jul 2020 13:45:09 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 905216113A;\n\tWed, 8 Jul 2020 15:45:09 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 141AD6112A\n\tfor ;\n\tWed, 8 Jul 2020 15:45:08 +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 A09C851B;\n\tWed, 8 Jul 2020 15:45:06 +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=\"lyqByvsp\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1594215907;\n\tbh=iof/eFIAYUI83C0g4FhCc3+A81VxGgPrQS5fAebccvc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=lyqByvspvDbUgonZv9z9fx9l4UsAKHz+CKDPg/sxp/RBTjE4Q0sCOQS5EMd2AVPYG\n\t1kHB03OZ9R0X3KO6/Lk/uQULn9SwSAfJWwJIYIHN+lsOfzD4KCS+6u8Z0ssQDHIOTm\n\t2xDvo2vBvNXO9U3jirRcgW/CQSIyQrXBQxlKzC1U=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 8 Jul 2020 22:44:14 +0900","Message-Id":"<20200708134417.67747-19-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 18/21] libcamera: uvcvideo: 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 \n\n---\nChanges in v4:\n- return error if tryFormat fails\n- pass UVCCameraData to UVCCameraConfiguration, instead of\n V4l2VideoDevice\n- mention motivation in commit message\n\nNew in v3\n---\n src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 23 +++++++++++++++-----\n 1 file changed, 18 insertions(+), 5 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\nindex 9db69dd..47f383d 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -53,9 +53,12 @@ public:\n class UVCCameraConfiguration : public CameraConfiguration\n {\n public:\n-\tUVCCameraConfiguration();\n+\tUVCCameraConfiguration(UVCCameraData *data);\n \n \tStatus validate() override;\n+\n+private:\n+\tUVCCameraData *data_;\n };\n \n class PipelineHandlerUVC : public PipelineHandler\n@@ -89,8 +92,8 @@ private:\n \t}\n };\n \n-UVCCameraConfiguration::UVCCameraConfiguration()\n-\t: CameraConfiguration()\n+UVCCameraConfiguration::UVCCameraConfiguration(UVCCameraData *data)\n+\t: CameraConfiguration(), data_(data)\n {\n }\n \n@@ -141,6 +144,17 @@ CameraConfiguration::Status UVCCameraConfiguration::validate()\n \n \tcfg.bufferCount = 4;\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@@ -153,7 +167,7 @@ CameraConfiguration *PipelineHandlerUVC::generateConfiguration(Camera *camera,\n \tconst StreamRoles &roles)\n {\n \tUVCCameraData *data = cameraData(camera);\n-\tCameraConfiguration *config = new UVCCameraConfiguration();\n+\tCameraConfiguration *config = new UVCCameraConfiguration(data);\n \n \tif (roles.empty())\n \t\treturn config;\n@@ -200,7 +214,6 @@ int PipelineHandlerUVC::configure(Camera *camera, CameraConfiguration *config)\n \t\treturn -EINVAL;\n \n \tcfg.setStream(&data->stream_);\n-\tcfg.stride = format.planes[0].bpl;\n \n \treturn 0;\n }\n","prefixes":["libcamera-devel","v4","18/21"]}