Patch Detail
Show a patch.
GET /api/1.1/patches/1447/?format=api
{ "id": 1447, "url": "https://patchwork.libcamera.org/api/1.1/patches/1447/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1447/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20190616133402.21934-17-niklas.soderlund@ragnatech.se>", "date": "2019-06-16T13:34:02", "name": "[libcamera-devel,v3,16/16] libcamera: pipeline: uvcvideo: Add format information and validation", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "c22fb5032dfdf7394a14e62eb75077c9be19bc25", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/1.1/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/1447/mbox/", "series": [ { "id": 358, "url": "https://patchwork.libcamera.org/api/1.1/series/358/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=358", "date": "2019-06-16T13:33:46", "name": "libcamera: Add support for format information and validation", "version": 3, "mbox": "https://patchwork.libcamera.org/series/358/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1447/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1447/checks/", "tags": {}, "headers": { "Return-Path": "<niklas.soderlund@ragnatech.se>", "Received": [ "from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 351D164780\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 16 Jun 2019 15:35:44 +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 9c2935e2-903b-11e9-8ab4-005056917a89;\n\tSun, 16 Jun 2019 15:35:31 +0200 (CEST)" ], "X-Halon-ID": "9c2935e2-903b-11e9-8ab4-005056917a89", "Authorized-sender": "niklas@soderlund.pp.se", "From": "=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Sun, 16 Jun 2019 15:34:02 +0200", "Message-Id": "<20190616133402.21934-17-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190616133402.21934-1-niklas.soderlund@ragnatech.se>", "References": "<20190616133402.21934-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 16/16] libcamera: pipeline: uvcvideo:\n\tAdd format information and validation", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.23", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "X-List-Received-Date": "Sun, 16 Jun 2019 13:35:44 -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 <niklas.soderlund@ragnatech.se>\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/libcamera/pipeline/uvcvideo.cpp | 41 ++++++++++++++++++++++-------\n 1 file changed, 31 insertions(+), 10 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\nindex 45260f34c8f5daba..7ca9d0eefe8223e8 100644\n--- a/src/libcamera/pipeline/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo.cpp\n@@ -5,6 +5,8 @@\n * uvcvideo.cpp - Pipeline handler for uvcvideo devices\n */\n \n+#include <algorithm>\n+\n #include <libcamera/camera.h>\n #include <libcamera/request.h>\n #include <libcamera/stream.h>\n@@ -95,18 +97,33 @@ CameraConfiguration::Status UVCCameraConfiguration::validate()\n \t}\n \n \tStreamConfiguration &cfg = config_[0];\n-\n-\t/* \\todo: Validate the configuration against the device capabilities. */\n+\tconst StreamFormats &formats = cfg.formats();\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+\tconst std::vector<unsigned int> pixelFormats = formats.pixelformats();\n+\tauto iter = std::find(pixelFormats.begin(), pixelFormats.end(), pixelFormat);\n+\tif (iter == pixelFormats.end()) {\n+\t\tcfg.pixelFormat = pixelFormats.front();\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+\tconst std::vector<Size> &formatSizes = formats.sizes(cfg.pixelFormat);\n+\tcfg.size = formatSizes.front();\n+\tfor (const Size &formatsSize : formatSizes) {\n+\t\tif (formatsSize > size)\n+\t\t\tbreak;\n+\n+\t\tcfg.size = formatsSize;\n+\t}\n \n-\tif (cfg.pixelFormat != pixelFormat || cfg.size != size) {\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@@ -123,14 +140,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+\tImageFormats 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", "v3", "16/16" ] }