{"id":1310,"url":"https://patchwork.libcamera.org/api/1.1/patches/1310/?format=json","web_url":"https://patchwork.libcamera.org/patch/1310/","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":"<20190527001543.13593-18-niklas.soderlund@ragnatech.se>","date":"2019-05-27T00:15:43","name":"[libcamera-devel,17/17] libcamera: pipeline: uvcvideo: Add format information and validation","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"8b52262a146806dc8ae43071c223839e6084320f","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/1.1/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1310/mbox/","series":[{"id":328,"url":"https://patchwork.libcamera.org/api/1.1/series/328/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=328","date":"2019-05-27T00:15:28","name":"libcamera: Add support for format information and validation","version":1,"mbox":"https://patchwork.libcamera.org/series/328/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1310/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1310/checks/","tags":{},"headers":{"Return-Path":"","Received":["from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B4742618F9\n\tfor ;\n\tMon, 27 May 2019 02:16:14 +0200 (CEST)","from bismarck.berto.se (unknown [89.233.230.99])\n\tby bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid a199a472-8014-11e9-8ab4-005056917a89;\n\tMon, 27 May 2019 02:16:11 +0200 (CEST)"],"X-Halon-ID":"a199a472-8014-11e9-8ab4-005056917a89","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 27 May 2019 02:15:43 +0200","Message-Id":"<20190527001543.13593-18-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20190527001543.13593-1-niklas.soderlund@ragnatech.se>","References":"<20190527001543.13593-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 17/17] libcamera: pipeline: uvcvideo: Add\n\tformat information and validation","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":"Mon, 27 May 2019 00:16:15 -0000"},"content":"Extend the uvcvideo pipeline with format information and validation. The\nformat information is gathered by enumerating the v4l2 device. This\nenumeration approach is valid for UVC as it has a static and simple\nmedia graph.\n\nSigned-off-by: Niklas Söderlund \n---\n src/libcamera/pipeline/uvcvideo.cpp | 46 +++++++++++++++++++++++------\n 1 file changed, 37 insertions(+), 9 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\nindex 45260f34c8f5daba..ce9f281891a8bc5e 100644\n--- a/src/libcamera/pipeline/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo.cpp\n@@ -95,18 +95,42 @@ CameraConfiguration::Status UVCCameraConfiguration::validate()\n \t}\n \n \tStreamConfiguration &cfg = config_[0];\n+\tconst StreamFormats &formats = cfg.formats();\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 \n-\tcfg.pixelFormat = V4L2_PIX_FMT_YUYV;\n-\tcfg.size = { 640, 480 };\n+\tbool found = false;\n+\tfor (unsigned int pixfmt : formats.pixelformats()) {\n+\t\tif (pixfmt == pixelFormat) {\n+\t\t\tfound = true;\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\tif (!found)\n+\t\tcfg.pixelFormat = formats.pixelformats().front();\n \n-\tif (cfg.pixelFormat != pixelFormat || cfg.size != size) {\n+\tif (cfg.pixelFormat != pixelFormat) {\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 pixel format from \" << pixelFormat\n+\t\t\t<< \" to \" << cfg.pixelFormat;\n+\t\tstatus = Adjusted;\n+\t}\n+\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 size from \" << size.toString()\n+\t\t\t<< \" to \" << cfg.size.toString();\n \t\tstatus = Adjusted;\n \t}\n \n@@ -123,14 +147,18 @@ PipelineHandlerUVC::PipelineHandlerUVC(CameraManager *manager)\n CameraConfiguration *PipelineHandlerUVC::generateConfiguration(Camera *camera,\n \tconst StreamRoles &roles)\n {\n+\tUVCCameraData *data = cameraData(camera);\n \tCameraConfiguration *config = new UVCCameraConfiguration();\n \n \tif (roles.empty())\n \t\treturn config;\n \n-\tStreamConfiguration cfg{};\n-\tcfg.pixelFormat = V4L2_PIX_FMT_YUYV;\n-\tcfg.size = { 640, 480 };\n+\tV4L2DeviceFormats v4l2formats = data->video_->formats();\n+\tStreamFormats formats(v4l2formats.data());\n+\tStreamConfiguration cfg(formats);\n+\n+\tcfg.pixelFormat = formats.pixelformats().front();\n+\tcfg.size = formats.sizes(cfg.pixelFormat).back();\n \tcfg.bufferCount = 4;\n \n \tconfig->addConfiguration(cfg);\n","prefixes":["libcamera-devel","17/17"]}