{"id":8855,"url":"https://patchwork.libcamera.org/api/1.1/patches/8855/?format=json","web_url":"https://patchwork.libcamera.org/patch/8855/","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":"<20200718132324.867815-7-niklas.soderlund@ragnatech.se>","date":"2020-07-18T13:23:21","name":"[libcamera-devel,6/9] libcamera: pipeline: vimc: Align camera name","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"e9022517e48dd6d3b808851ea427aa536aa63459","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":{"id":16,"url":"https://patchwork.libcamera.org/api/1.1/users/16/?format=json","username":"neg","first_name":"Niklas","last_name":"Söderlund","email":"niklas.soderlund@ragnatech.se"},"mbox":"https://patchwork.libcamera.org/patch/8855/mbox/","series":[{"id":1115,"url":"https://patchwork.libcamera.org/api/1.1/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/8855/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8855/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 9A37AC0109\n\tfor ;\n\tSat, 18 Jul 2020 13:23:39 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7354060729;\n\tSat, 18 Jul 2020 15:23:39 +0200 (CEST)","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 14425605CC\n\tfor ;\n\tSat, 18 Jul 2020 15:23:35 +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 e0a59279-c8f9-11ea-933e-005056917a89;\n\tSat, 18 Jul 2020 15:23:33 +0200 (CEST)"],"X-Halon-ID":"e0a59279-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:21 +0200","Message-Id":"<20200718132324.867815-7-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 6/9] libcamera: pipeline: vimc: Align\n\tcamera name","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":"In preparation to aligning how cameras are named drop the VIMC prefix\nfrom the camera name and use the sensor entity name instead of the\nsensor model.\n\nFor the sensors in VIMC pipeline the model and entity name are the same\nas model is derived from entity name with the i2c information (if any)\nremoved. As the VIMC sensors are not attached to a i2c bus there is\nnothing to remove and the two are the same.\n\nBefore this change the camera name was\n\n'VIMC Sensor B'\n\nAfter this change the camera name is\n\n'Sensor B'\n\nSigned-off-by: Niklas Söderlund \n---\n src/libcamera/pipeline/vimc/vimc.cpp | 4 ++--\n test/camera/buffer_import.cpp | 2 +-\n test/camera/capture.cpp | 2 +-\n test/camera/configuration_default.cpp | 2 +-\n test/camera/configuration_set.cpp | 2 +-\n test/camera/statemachine.cpp | 2 +-\n test/controls/control_info_map.cpp | 2 +-\n test/controls/control_list.cpp | 2 +-\n 8 files changed, 9 insertions(+), 9 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\nindex 38656d28b357dd1b..6560b632ae55b304 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -432,10 +432,10 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n \t\treturn false;\n \n \t/* Create and register the camera. */\n-\tstd::string name{ \"VIMC \" + data->sensor_->model() };\n \tstd::set streams{ &data->stream_ };\n \tstd::shared_ptr camera = Camera::create(this, data->sensor_->id(),\n-\t\t\t\t\t\t\tname, streams);\n+\t\t\t\t\t\t\tdata->sensor_->entity()->name(),\n+\t\t\t\t\t\t\tstreams);\n \tregisterCamera(std::move(camera), std::move(data));\n \n \treturn true;\ndiff --git a/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp\nindex ad680a83f9187213..04d3bb37a653e7e4 100644\n--- a/test/camera/buffer_import.cpp\n+++ b/test/camera/buffer_import.cpp\n@@ -28,7 +28,7 @@ class BufferImportTest : public CameraTest, public Test\n {\n public:\n \tBufferImportTest()\n-\t\t: CameraTest(\"VIMC Sensor B\")\n+\t\t: CameraTest(\"Sensor B\")\n \t{\n \t}\n \ndiff --git a/test/camera/capture.cpp b/test/camera/capture.cpp\nindex f6b2f348bda52752..6a0e0e456e321a71 100644\n--- a/test/camera/capture.cpp\n+++ b/test/camera/capture.cpp\n@@ -18,7 +18,7 @@ class Capture : public CameraTest, public Test\n {\n public:\n \tCapture()\n-\t\t: CameraTest(\"VIMC Sensor B\")\n+\t\t: CameraTest(\"Sensor B\")\n \t{\n \t}\n \ndiff --git a/test/camera/configuration_default.cpp b/test/camera/configuration_default.cpp\nindex 31c908d2449eafe7..b8612134e4bcf497 100644\n--- a/test/camera/configuration_default.cpp\n+++ b/test/camera/configuration_default.cpp\n@@ -18,7 +18,7 @@ class ConfigurationDefault : public CameraTest, public Test\n {\n public:\n \tConfigurationDefault()\n-\t\t: CameraTest(\"VIMC Sensor B\")\n+\t\t: CameraTest(\"Sensor B\")\n \t{\n \t}\n \ndiff --git a/test/camera/configuration_set.cpp b/test/camera/configuration_set.cpp\nindex b4b5968115e81f59..35597f4452b18dad 100644\n--- a/test/camera/configuration_set.cpp\n+++ b/test/camera/configuration_set.cpp\n@@ -18,7 +18,7 @@ class ConfigurationSet : public CameraTest, public Test\n {\n public:\n \tConfigurationSet()\n-\t\t: CameraTest(\"VIMC Sensor B\")\n+\t\t: CameraTest(\"Sensor B\")\n \t{\n \t}\n \ndiff --git a/test/camera/statemachine.cpp b/test/camera/statemachine.cpp\nindex 325b4674bcc958d8..2816db7b99446549 100644\n--- a/test/camera/statemachine.cpp\n+++ b/test/camera/statemachine.cpp\n@@ -18,7 +18,7 @@ class Statemachine : public CameraTest, public Test\n {\n public:\n \tStatemachine()\n-\t\t: CameraTest(\"VIMC Sensor B\")\n+\t\t: CameraTest(\"Sensor B\")\n \t{\n \t}\n \ndiff --git a/test/controls/control_info_map.cpp b/test/controls/control_info_map.cpp\nindex e4305f132db7952f..da49553ab41ca996 100644\n--- a/test/controls/control_info_map.cpp\n+++ b/test/controls/control_info_map.cpp\n@@ -24,7 +24,7 @@ class ControlInfoMapTest : public CameraTest, public Test\n {\n public:\n \tControlInfoMapTest()\n-\t\t: CameraTest(\"VIMC Sensor B\")\n+\t\t: CameraTest(\"Sensor B\")\n \t{\n \t}\n \ndiff --git a/test/controls/control_list.cpp b/test/controls/control_list.cpp\nindex 5c8485b5dcc31499..25bcf6edc4cbaa82 100644\n--- a/test/controls/control_list.cpp\n+++ b/test/controls/control_list.cpp\n@@ -24,7 +24,7 @@ class ControlListTest : public CameraTest, public Test\n {\n public:\n \tControlListTest()\n-\t\t: CameraTest(\"VIMC Sensor B\")\n+\t\t: CameraTest(\"Sensor B\")\n \t{\n \t}\n \n","prefixes":["libcamera-devel","6/9"]}