{"id":9052,"url":"https://patchwork.libcamera.org/api/1.1/patches/9052/?format=json","web_url":"https://patchwork.libcamera.org/patch/9052/","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":"<20200728234225.3505868-4-niklas.soderlund@ragnatech.se>","date":"2020-07-28T23:42:24","name":"[libcamera-devel,v3,4/5] libcamera: pipeline: uvcvideo: Generate unique camera names","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"cd9c65b08760b8b98970f79d605961b8750b99ec","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/9052/mbox/","series":[{"id":1158,"url":"https://patchwork.libcamera.org/api/1.1/series/1158/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1158","date":"2020-07-28T23:37:39","name":"libcamera: Generate unique and stable camera names","version":3,"mbox":"https://patchwork.libcamera.org/series/1158/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9052/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9052/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 C2979BD86F\n\tfor ;\n\tTue, 28 Jul 2020 23:42:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9844C6185C;\n\tWed, 29 Jul 2020 01:42:44 +0200 (CEST)","from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 488456185C\n\tfor ;\n\tWed, 29 Jul 2020 01:42:40 +0200 (CEST)","from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de\n\t[79.202.46.202]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid 05bd863d-d12c-11ea-8fb8-005056917f90;\n\tWed, 29 Jul 2020 01:42:39 +0200 (CEST)"],"X-Halon-ID":"05bd863d-d12c-11ea-8fb8-005056917f90","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 29 Jul 2020 01:42:24 +0200","Message-Id":"<20200728234225.3505868-4-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200728234225.3505868-1-niklas.soderlund@ragnatech.se>","References":"<20200728233744.3503740-1-niklas.soderlund@ragnatech.se>\n\t<20200728234225.3505868-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 4/5] libcamera: pipeline: uvcvideo:\n\tGenerate unique camera names","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=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Generate camera names that are unique and persistent between system\nresets. The name is constructed from the USB vendor and product\ninformation that is stored on USB device itself and the USB bus and\ndevice numbers where the hardware is plugged in.\n\nBefore this change example of camera names:\n\nVenus USB2.0 Camera: Venus USB2\nLogitech Webcam C930e\n\nAfter this change the same cameras are:\n\n0ac8:3420:3:10\n046d:0843:3:4\n\nSigned-off-by: Niklas Söderlund \n---\n src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 34 +++++++++++++++++++-\n 1 file changed, 33 insertions(+), 1 deletion(-)","diff":"diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\nindex 93e3dc17e3a7105e..72f3f5d9f7c414d0 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -6,6 +6,7 @@\n */\n \n #include \n+#include \n #include \n #include \n #include \n@@ -81,6 +82,9 @@ public:\n \tbool match(DeviceEnumerator *enumerator) override;\n \n private:\n+\tstd::string generateName(const MediaDevice *media,\n+\t\t\t\t const std::string path);\n+\n \tint processControl(ControlList *controls, unsigned int id,\n \t\t\t const ControlValue &value);\n \tint processControls(UVCCameraData *data, Request *request);\n@@ -379,6 +383,28 @@ int PipelineHandlerUVC::queueRequestDevice(Camera *camera, Request *request)\n \treturn 0;\n }\n \n+std::string PipelineHandlerUVC::generateName(const MediaDevice *media,\n+\t\t\t\t\t const std::string path)\n+{\n+\tstatic const std::vector files = { \"idVendor\", \"idProduct\", \"busnum\", \"devnum\" };\n+\tstd::vector values;\n+\tstd::string value;\n+\n+\tfor (const std::string &name : files) {\n+\t\tstd::ifstream file(path + \"/../\" + name);\n+\n+\t\tif (!file.is_open())\n+\t\t\treturn \"\";\n+\n+\t\tstd::getline(file, value);\n+\t\tfile.close();\n+\n+\t\tvalues.push_back(value);\n+\t}\n+\n+\treturn utils::join(values, \":\");\n+}\n+\n bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator)\n {\n \tMediaDevice *media;\n@@ -405,8 +431,14 @@ bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator)\n \t\treturn false;\n \n \t/* Create and register the camera. */\n+\tstd::string name = generateName(media, data->video_->devicePath());\n+\tif (name.empty()) {\n+\t\tLOG(UVC, Error) << \"Failed to generate camera name\";\n+\t\treturn false;\n+\t}\n+\n \tstd::set streams{ &data->stream_ };\n-\tstd::shared_ptr camera = Camera::create(this, media->model(), streams);\n+\tstd::shared_ptr camera = Camera::create(this, name, streams);\n \tregisterCamera(std::move(camera), std::move(data));\n \n \t/* Enable hot-unplug notifications. */\n","prefixes":["libcamera-devel","v3","4/5"]}