{"id":22918,"url":"https://patchwork.libcamera.org/api/patches/22918/?format=json","web_url":"https://patchwork.libcamera.org/patch/22918/","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":"<20250303193349.785692-2-barnabas.pocze@ideasonboard.com>","date":"2025-03-03T19:33:49","name":"[v1,2/2] libcamera: camera_sensor: getFormat(): Use span","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"d707f0ea13e74e5a7fd8138c50a25af107e5c8d4","submitter":{"id":216,"url":"https://patchwork.libcamera.org/api/people/216/?format=json","name":"Barnabás Pőcze","email":"barnabas.pocze@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22918/mbox/","series":[{"id":5042,"url":"https://patchwork.libcamera.org/api/series/5042/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5042","date":"2025-03-03T19:33:48","name":"[v1,1/2] libcamera: camera_sensor: getControls(): Use span","version":1,"mbox":"https://patchwork.libcamera.org/series/5042/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22918/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22918/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 67B6BC3263\n\tfor ;\n\tMon, 3 Mar 2025 19:33:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C92EB68895;\n\tMon, 3 Mar 2025 20:33:56 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2F52D68891\n\tfor ;\n\tMon, 3 Mar 2025 20:33:53 +0100 (CET)","from pb-laptop.local (185.221.143.4.nat.pool.zt.hu [185.221.143.4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A06F911E9\n\tfor ;\n\tMon, 3 Mar 2025 20:32:21 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"AklhdbUR\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1741030341;\n\tbh=7n0YDvf+2+SJjizV45sha3UemDNZ8dcscR5BeWaU4G8=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=AklhdbURNYJuvbeUu6Yz0M02UGWjh4EiO8Mgd0oTMyT08Pp/M5l/eiTCFGzvp+EjN\n\tOuO7+2uMBMhMW2xZhR19GQzBb96+F75/3icoc8f0suuU5blovKut5Lb/eFqGepMwhP\n\tkN5+FYuehx6+xvzRy3dqaVK9GE7OS8ALUfHJCJ/g=","From":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH v1 2/2] libcamera: camera_sensor: getFormat(): Use span","Date":"Mon, 3 Mar 2025 20:33:49 +0100","Message-ID":"<20250303193349.785692-2-barnabas.pocze@ideasonboard.com>","X-Mailer":"git-send-email 2.48.1","In-Reply-To":"<20250303193349.785692-1-barnabas.pocze@ideasonboard.com>","References":"<20250303193349.785692-1-barnabas.pocze@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Do not force the caller to construct a vector.\n\nSigned-off-by: Barnabás Pőcze \n---\n include/libcamera/internal/camera_sensor.h | 2 +-\n src/libcamera/pipeline/rkisp1/rkisp1_path.cpp | 4 ++--\n src/libcamera/sensor/camera_sensor_legacy.cpp | 4 ++--\n src/libcamera/sensor/camera_sensor_raw.cpp | 4 ++--\n test/camera-sensor.cpp | 11 +++++++----\n 5 files changed, 14 insertions(+), 11 deletions(-)","diff":"diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\nindex 59a1604c5..f6ef4df17 100644\n--- a/include/libcamera/internal/camera_sensor.h\n+++ b/include/libcamera/internal/camera_sensor.h\n@@ -54,7 +54,7 @@ public:\n \tvirtual Size resolution() const = 0;\n \n \tvirtual V4L2SubdeviceFormat\n-\tgetFormat(const std::vector &mbusCodes,\n+\tgetFormat(Span mbusCodes,\n \t\t const Size &size, const Size maxSize = Size()) const = 0;\n \tvirtual int setFormat(V4L2SubdeviceFormat *format,\n \t\t\t Transform transform = Transform::Identity) = 0;\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\nindex eee5b09e2..ba702b454 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n@@ -339,7 +339,7 @@ RkISP1Path::validate(const CameraSensor *sensor,\n \t\t\t\t\t : cfg->size;\n \n \t\tV4L2SubdeviceFormat sensorFormat =\n-\t\t\tsensor->getFormat({ mbusCode }, rawSize);\n+\t\t\tsensor->getFormat(std::array{ mbusCode }, rawSize);\n \n \t\tif (sensorConfig &&\n \t\t sensorConfig->outputSize != sensorFormat.size)\n@@ -360,7 +360,7 @@ RkISP1Path::validate(const CameraSensor *sensor,\n \n \t\tuint32_t mbusCode = formatToMediaBus.at(rawFormat);\n \t\tV4L2SubdeviceFormat sensorFormat =\n-\t\t\tsensor->getFormat({ mbusCode }, sensorSize);\n+\t\t\tsensor->getFormat(std::array{ mbusCode }, sensorSize);\n \n \t\tif (sensorFormat.size != sensorSize)\n \t\t\treturn CameraConfiguration::Invalid;\ndiff --git a/src/libcamera/sensor/camera_sensor_legacy.cpp b/src/libcamera/sensor/camera_sensor_legacy.cpp\nindex 1eccca519..1b9b5c9a0 100644\n--- a/src/libcamera/sensor/camera_sensor_legacy.cpp\n+++ b/src/libcamera/sensor/camera_sensor_legacy.cpp\n@@ -73,7 +73,7 @@ public:\n \tstd::vector sizes(unsigned int mbusCode) const override;\n \tSize resolution() const override;\n \n-\tV4L2SubdeviceFormat getFormat(const std::vector &mbusCodes,\n+\tV4L2SubdeviceFormat getFormat(Span mbusCodes,\n \t\t\t\t const Size &size,\n \t\t\t\t const Size maxSize) const override;\n \tint setFormat(V4L2SubdeviceFormat *format,\n@@ -699,7 +699,7 @@ Size CameraSensorLegacy::resolution() const\n }\n \n V4L2SubdeviceFormat\n-CameraSensorLegacy::getFormat(const std::vector &mbusCodes,\n+CameraSensorLegacy::getFormat(Span mbusCodes,\n \t\t\t const Size &size, Size maxSize) const\n {\n \tunsigned int desiredArea = size.width * size.height;\ndiff --git a/src/libcamera/sensor/camera_sensor_raw.cpp b/src/libcamera/sensor/camera_sensor_raw.cpp\nindex c65ecbb86..7ac0f563d 100644\n--- a/src/libcamera/sensor/camera_sensor_raw.cpp\n+++ b/src/libcamera/sensor/camera_sensor_raw.cpp\n@@ -74,7 +74,7 @@ public:\n \tstd::vector sizes(unsigned int mbusCode) const override;\n \tSize resolution() const override;\n \n-\tV4L2SubdeviceFormat getFormat(const std::vector &mbusCodes,\n+\tV4L2SubdeviceFormat getFormat(Span mbusCodes,\n \t\t\t\t const Size &size,\n \t\t\t\t const Size maxSize) const override;\n \tint setFormat(V4L2SubdeviceFormat *format,\n@@ -757,7 +757,7 @@ Size CameraSensorRaw::resolution() const\n }\n \n V4L2SubdeviceFormat\n-CameraSensorRaw::getFormat(const std::vector &mbusCodes,\n+CameraSensorRaw::getFormat(Span mbusCodes,\n \t\t\t const Size &size, Size maxSize) const\n {\n \tunsigned int desiredArea = size.width * size.height;\ndiff --git a/test/camera-sensor.cpp b/test/camera-sensor.cpp\nindex 869c78896..c30a2212e 100644\n--- a/test/camera-sensor.cpp\n+++ b/test/camera-sensor.cpp\n@@ -96,10 +96,13 @@ protected:\n \t\t}\n \n \t\t/* Use an invalid format and make sure it's not selected. */\n-\t\tV4L2SubdeviceFormat format = sensor_->getFormat({ 0xdeadbeef,\n-\t\t\t\t\t\t\t\t MEDIA_BUS_FMT_SBGGR10_1X10,\n-\t\t\t\t\t\t\t\t MEDIA_BUS_FMT_BGR888_1X24 },\n-\t\t\t\t\t\t\t\tSize(1024, 768));\n+\t\tstatic constexpr uint32_t mbusCodes[] = {\n+\t\t\t0xdeadbeef,\n+\t\t\tMEDIA_BUS_FMT_SBGGR10_1X10,\n+\t\t\tMEDIA_BUS_FMT_BGR888_1X24,\n+\t\t};\n+\n+\t\tV4L2SubdeviceFormat format = sensor_->getFormat(mbusCodes, Size(1024, 768));\n \t\tif (format.code != MEDIA_BUS_FMT_SBGGR10_1X10 ||\n \t\t format.size != Size(4096, 2160)) {\n \t\t\tcerr << \"Failed to get a suitable format, expected 4096x2160-0x\"\n","prefixes":["v1","2/2"]}