{"id":8568,"url":"https://patchwork.libcamera.org/api/1.1/patches/8568/?format=json","web_url":"https://patchwork.libcamera.org/patch/8568/","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":"<20200702231107.1800602-3-niklas.soderlund@ragnatech.se>","date":"2020-07-02T23:11:07","name":"[libcamera-devel,v3,2/2] libcamera: ipu3: cio2: Make use of utils::map_keys() helper","commit_ref":"271d048b2d30291bb7c002f7064b0691028382bf","pull_url":null,"state":"accepted","archived":false,"hash":"f4fbf1b12cd0bc8b1d561d429873aec0e1ecb600","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/8568/mbox/","series":[{"id":1075,"url":"https://patchwork.libcamera.org/api/1.1/series/1075/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1075","date":"2020-07-02T23:11:05","name":"libcamera: utils: Add map_keys() function","version":3,"mbox":"https://patchwork.libcamera.org/series/1075/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8568/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8568/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 DF56DC2E69\n\tfor ;\n\tThu, 2 Jul 2020 23:11:15 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A2DAE60C62;\n\tFri, 3 Jul 2020 01:11:14 +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 5B3B4603B3\n\tfor ;\n\tFri, 3 Jul 2020 01:11:13 +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 524d1ce1-bcb9-11ea-8fb8-005056917f90;\n\tFri, 03 Jul 2020 01:11:12 +0200 (CEST)"],"X-Halon-ID":"524d1ce1-bcb9-11ea-8fb8-005056917f90","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 3 Jul 2020 01:11:07 +0200","Message-Id":"<20200702231107.1800602-3-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200702231107.1800602-1-niklas.soderlund@ragnatech.se>","References":"<20200702231107.1800602-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 2/2] libcamera: ipu3: cio2: Make use of\n\tutils::map_keys() helper","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":"Use a helper instead of local code to retrieve all keys from a map.\n\nSigned-off-by: Niklas Söderlund \nReviewed-by: Kieran Bingham \n---\n src/libcamera/pipeline/ipu3/cio2.cpp | 19 +++----------------\n 1 file changed, 3 insertions(+), 16 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp\nindex 97a434a73b2855e5..cb8c80a4a9ca538a 100644\n--- a/src/libcamera/pipeline/ipu3/cio2.cpp\n+++ b/src/libcamera/pipeline/ipu3/cio2.cpp\n@@ -94,11 +94,7 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)\n \t * utils::set_overlap requires the ranges to be sorted, keep the\n \t * cio2Codes vector sorted in ascending order.\n \t */\n-\tstd::vector cio2Codes;\n-\tcio2Codes.reserve(mbusCodesToInfo.size());\n-\tstd::transform(mbusCodesToInfo.begin(), mbusCodesToInfo.end(),\n-\t\t std::back_inserter(cio2Codes),\n-\t\t [](auto &pair) { return pair.first; });\n+\tstd::vector cio2Codes = utils::map_keys(mbusCodesToInfo);\n \tconst std::vector &sensorCodes = sensor_->mbusCodes();\n \tif (!utils::set_overlap(sensorCodes.begin(), sensorCodes.end(),\n \t\t\t\tcio2Codes.begin(), cio2Codes.end())) {\n@@ -138,12 +134,7 @@ int CIO2Device::configure(const Size &size, V4L2DeviceFormat *outputFormat)\n \t * Apply the selected format to the sensor, the CSI-2 receiver and\n \t * the CIO2 output device.\n \t */\n-\tstd::vector mbusCodes;\n-\tmbusCodes.reserve(mbusCodesToInfo.size());\n-\tstd::transform(mbusCodesToInfo.begin(), mbusCodesToInfo.end(),\n-\t\t std::back_inserter(mbusCodes),\n-\t\t [](auto &pair) { return pair.first; });\n-\n+\tstd::vector mbusCodes = utils::map_keys(mbusCodesToInfo);\n \tsensorFormat = sensor_->getFormat(mbusCodes, size);\n \tret = sensor_->setFormat(&sensorFormat);\n \tif (ret)\n@@ -182,11 +173,7 @@ CIO2Device::generateConfiguration(Size size) const\n \t\tsize = sensor_->resolution();\n \n \t/* Query the sensor static information for closest match. */\n-\tstd::vector mbusCodes;\n-\tstd::transform(mbusCodesToInfo.begin(), mbusCodesToInfo.end(),\n-\t\t std::back_inserter(mbusCodes),\n-\t\t [](auto &pair) { return pair.first; });\n-\n+\tstd::vector mbusCodes = utils::map_keys(mbusCodesToInfo);\n \tV4L2SubdeviceFormat sensorFormat = sensor_->getFormat(mbusCodes, size);\n \tif (!sensorFormat.mbus_code) {\n \t\tLOG(IPU3, Error) << \"Sensor does not support mbus code\";\n","prefixes":["libcamera-devel","v3","2/2"]}