{"id":8853,"url":"https://patchwork.libcamera.org/api/patches/8853/?format=json","web_url":"https://patchwork.libcamera.org/patch/8853/","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":"<20200718132324.867815-5-niklas.soderlund@ragnatech.se>","date":"2020-07-18T13:23:19","name":"[libcamera-devel,4/9] libcamera: camera_manager: Enforce unique camera IDs","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"64c74baa28abd53ed9a85a9b24eb18917e3961cb","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8853/mbox/","series":[{"id":1115,"url":"https://patchwork.libcamera.org/api/series/1115/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1115","date":"2020-07-18T13:23:15","name":"libcamera: camera: Add camera ID","version":1,"mbox":"https://patchwork.libcamera.org/series/1115/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8853/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8853/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 F20BBC2E68\n\tfor ;\n\tSat, 18 Jul 2020 13:23:37 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E631360738;\n\tSat, 18 Jul 2020 15:23:36 +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 0F053605BB\n\tfor ;\n\tSat, 18 Jul 2020 15:23:34 +0200 (CEST)","from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de\n\t[79.202.46.202]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid e02e74a1-c8f9-11ea-933e-005056917a89;\n\tSat, 18 Jul 2020 15:23:32 +0200 (CEST)"],"X-Halon-ID":"e02e74a1-c8f9-11ea-933e-005056917a89","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 18 Jul 2020 15:23:19 +0200","Message-Id":"<20200718132324.867815-5-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200718132324.867815-1-niklas.soderlund@ragnatech.se>","References":"<20200718132324.867815-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 4/9] libcamera: camera_manager: Enforce\n\tunique camera IDs","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":"Before adding a camera to the CameraManager ensure the camera ID is\nunique.\n\nSigned-off-by: Niklas Söderlund \n---\n src/libcamera/camera_manager.cpp | 7 +++++++\n 1 file changed, 7 insertions(+)","diff":"diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex f60491d2c1a7500f..4d23d601e1fc8a28 100644\n--- a/src/libcamera/camera_manager.cpp\n+++ b/src/libcamera/camera_manager.cpp\n@@ -183,6 +183,13 @@ void CameraManager::Private::addCamera(std::shared_ptr camera,\n \t\t\t\t<< camera->name() << \"'\";\n \t\t\tbreak;\n \t\t}\n+\n+\t\tif (c->id() == camera->id()) {\n+\t\t\tLOG(Camera, Error)\n+\t\t\t\t<< \"Skipped registering camera with duplicated ID '\"\n+\t\t\t\t<< camera->id() << \"'\";\n+\t\t\treturn;\n+\t\t}\n \t}\n \n \tcameras_.push_back(std::move(camera));\n","prefixes":["libcamera-devel","4/9"]}