{"id":1228,"url":"https://patchwork.libcamera.org/api/patches/1228/?format=json","web_url":"https://patchwork.libcamera.org/patch/1228/","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":"<20190517230621.24668-12-laurent.pinchart@ideasonboard.com>","date":"2019-05-17T23:06:20","name":"[libcamera-devel,PATCH/RFC,11/12] libcamera: pipeline: uvcvideo: Validate format in UVCCameraConfiguration::validate()","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"1dc615abd9cbcd0fca89f6423f20c152a0a2afa5","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1228/mbox/","series":[{"id":307,"url":"https://patchwork.libcamera.org/api/series/307/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=307","date":"2019-05-17T23:06:09","name":"Rework camera configuration to introduce negotiation of parameters","version":1,"mbox":"https://patchwork.libcamera.org/series/307/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1228/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1228/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6F5F361880\n\tfor ;\n\tSat, 18 May 2019 01:06:46 +0200 (CEST)","from pendragon.bb.dnainternet.fi\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 16985549\n\tfor ;\n\tSat, 18 May 2019 01:06:46 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1558134406;\n\tbh=N5Z05dGtKGOdQk7W9NFxBi/RrT1pg9hi6HqixLgiwoM=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=Ga+t3KvXT89l3IO83wKePCvitgesEB7ikx8eYnPtzeud9zbFvaAkrTwzll7cKZtAF\n\tQ2aM28lwAJz89HShDA7rUPPKKnSz4buAFXh7cexIGaBzIsNwBRk5I9CO6qEsmcYdaW\n\tGSKwG6veSw6WzDYVYsB8VKYNDj7sBefTrg9KsLo8=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 18 May 2019 02:06:20 +0300","Message-Id":"<20190517230621.24668-12-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20190517230621.24668-1-laurent.pinchart@ideasonboard.com>","References":"<20190517230621.24668-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH/RFC 11/12] libcamera: pipeline: uvcvideo:\n\tValidate format in UVCCameraConfiguration::validate()","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Fri, 17 May 2019 23:06:49 -0000"},"content":"From: Niklas Söderlund \n\nValidate and potentially adjust the requested format with a list of\ndiscrete formats retrieved from the video device.\n\nSigned-off-by: Niklas Söderlund \n---\n src/libcamera/pipeline/uvcvideo.cpp | 44 ++++++++++++++++++++++++-----\n 1 file changed, 37 insertions(+), 7 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\nindex 286d19b0af01..e02d5b19e82a 100644\n--- a/src/libcamera/pipeline/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo.cpp\n@@ -37,6 +37,7 @@ public:\n \n \tV4L2Device *video_;\n \tStream stream_;\n+\tStreamFormats formats_;\n };\n \n class UVCCameraConfiguration : public CameraConfiguration\n@@ -45,6 +46,7 @@ public:\n \tUVCCameraConfiguration();\n \n \tStatus validate() override;\n+\tStreamFormats formats;\n };\n \n class PipelineHandlerUVC : public PipelineHandler\n@@ -96,21 +98,42 @@ CameraConfiguration::Status UVCCameraConfiguration::validate()\n \n \tStreamConfiguration &cfg = config_[0];\n \n-\t/* \\todo: Validate the configuration against the device capabilities. */\n \tconst unsigned int pixelFormat = cfg.pixelFormat;\n \tconst Size size = cfg.size;\n+\tconst unsigned int bufferCount = cfg.bufferCount;\n \n \tcfg.pixelFormat = V4L2_PIX_FMT_YUYV;\n-\tcfg.size = { 640, 480 };\n+\tif (cfg.pixelFormat != pixelFormat) {\n+\t\tLOG(UVC, Debug)\n+\t\t\t<< \"Adjusting pixel format from \" << pixelFormat\n+\t\t\t<< \" to \" << cfg.pixelFormat;\n+\t\tstatus = Adjusted;\n+\t}\n \n-\tif (cfg.pixelFormat != pixelFormat || cfg.size != size) {\n+\tconst std::vector &formatSizes = formats.sizes(cfg.pixelFormat);\n+\tcfg.size = formatSizes.front();\n+\tfor (const Size &formatsSize : formatSizes) {\n+\t\tif (formatsSize <= size)\n+\t\t\tcfg.size = formatsSize;\n+\n+\t\tif (formatsSize == size)\n+\t\t\tbreak;\n+\t}\n+\n+\tif (cfg.size != size) {\n \t\tLOG(UVC, Debug)\n-\t\t\t<< \"Adjusting configuration from \" << cfg.toString()\n-\t\t\t<< \" to \" << cfg.size.toString() << \"-YUYV\";\n+\t\t\t<< \"Adjusting size from \" << size.toString()\n+\t\t\t<< \" to \" << cfg.size.toString();\n \t\tstatus = Adjusted;\n \t}\n \n-\tcfg.bufferCount = 4;\n+\tif (bufferCount < 4) {\n+\t\tcfg.bufferCount = 4;\n+\t\tLOG(UVC, Debug)\n+\t\t\t<< \"Adjusting buffer count from \" << bufferCount\n+\t\t\t<< \" to \" << cfg.bufferCount;\n+\t\tstatus = Adjusted;\n+\t}\n \n \treturn status;\n }\n@@ -123,7 +146,10 @@ PipelineHandlerUVC::PipelineHandlerUVC(CameraManager *manager)\n CameraConfiguration *PipelineHandlerUVC::generateConfiguration(Camera *camera,\n \tconst StreamRoles &roles)\n {\n-\tCameraConfiguration *config = new UVCCameraConfiguration();\n+\tUVCCameraData *data = cameraData(camera);\n+\tUVCCameraConfiguration *config = new UVCCameraConfiguration();\n+\n+\tconfig->formats = data->formats_;\n \n \tif (!roles.empty()) {\n \t\tStreamConfiguration cfg{};\n@@ -242,6 +268,10 @@ bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator)\n \tif (data->video_->open())\n \t\treturn false;\n \n+\tdata->formats_ = StreamFormats(data->video_->enumerateFrameSizes({ V4L2_PIX_FMT_YUYV }));\n+\tfor (const Size &size : data->formats_.sizes(V4L2_PIX_FMT_YUYV))\n+\t\tLOG(UVC, Info) << size.toString();\n+\n \tdata->video_->bufferReady.connect(data.get(), &UVCCameraData::bufferReady);\n \n \t/* Create and register the camera. */\n","prefixes":["libcamera-devel","PATCH/RFC","11/12"]}