{"id":8641,"url":"https://patchwork.libcamera.org/api/1.1/patches/8641/?format=json","web_url":"https://patchwork.libcamera.org/patch/8641/","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-21-paul.elder@ideasonboard.com>","date":"2020-07-04T13:31:38","name":"[libcamera-devel,v3,20/22] libcamera: uvcvideo: Fill stride and frameSize at config validation","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"13cbf54a4b933abecf1760b060a7395ef7ee9327","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/8641/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/8641/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8641/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 6DC91BD792\n\tfor ;\n\tSat, 4 Jul 2020 13:32:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3AC5960E49;\n\tSat, 4 Jul 2020 15:32:36 +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 59DB660E1D\n\tfor ;\n\tSat, 4 Jul 2020 15:32:34 +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 D8768296;\n\tSat, 4 Jul 2020 15:32:32 +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=\"qSdi1mne\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593869554;\n\tbh=KOGId6hGRYPMm0kLUsJrYyVpshHv5MJNiSud5E1RI7w=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=qSdi1mnej52rveAy0BckZfHlbqVV9zqTwrPcdbBLiGDI/bqRrKcgwlon4ttGj28V8\n\tVu3F9SJXSZ6Nejdhs8QCyHzcPJLJ+Iwa/brj/WaBt8iIOScY6YYBeDB8WUvMSagPpT\n\turdc0xtIwcbklE56kig4m8fDJEgeHp4d2BRp7gk4=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 4 Jul 2020 22:31:38 +0900","Message-Id":"<20200704133140.1738660-21-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 20/22] 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.\n\nSigned-off-by: Paul Elder \n\n---\nNew in v3\n---\n src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 31 ++++++++++++++++----\n 1 file changed, 26 insertions(+), 5 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\nindex a5feab6..f8d258e 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(V4L2VideoDevice *video);\n \n \tStatus validate() override;\n+\n+private:\n+\tV4L2VideoDevice *video_;\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(V4L2VideoDevice *video)\n+\t: CameraConfiguration(), video_(video)\n {\n }\n \n@@ -141,6 +144,25 @@ CameraConfiguration::Status UVCCameraConfiguration::validate()\n \n \tcfg.bufferCount = 4;\n \n+\tV4L2DeviceFormat format = {};\n+\tformat.fourcc = video_->toV4L2PixelFormat(cfg.pixelFormat);\n+\tformat.size = cfg.size;\n+\n+\tint ret = video_->tryFormat(&format);\n+\tif (ret) {\n+\t\tLOG(UVC, Warning)\n+\t\t\t<< \"try_fmt failed, \"\n+\t\t\t<< \"getting stride and frameSize from PixelFormatInfo\";\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+\t\treturn status;\n+\t}\n+\n+\tcfg.stride = format.planes[0].bpl;\n+\tcfg.frameSize = format.planes[0].size;\n+\n \treturn status;\n }\n \n@@ -153,7 +175,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->video_);\n \n \tif (roles.empty())\n \t\treturn config;\n@@ -200,7 +222,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","v3","20/22"]}