{"id":13273,"url":"https://patchwork.libcamera.org/api/patches/13273/?format=json","web_url":"https://patchwork.libcamera.org/patch/13273/","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":"<20210810075854.86191-2-umang.jain@ideasonboard.com>","date":"2021-08-10T07:58:51","name":"[libcamera-devel,v2,1/4] libcamera: camera_sensor: Transform CameraSensor::sizes()","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"a9bbedf9fd60173a0116cb88be78cee60736db49","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/people/86/?format=json","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"delegate":{"id":12,"url":"https://patchwork.libcamera.org/api/users/12/?format=json","username":"uajain","first_name":"Umang","last_name":"Jain","email":"umang.jain@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/13273/mbox/","series":[{"id":2328,"url":"https://patchwork.libcamera.org/api/series/2328/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2328","date":"2021-08-10T07:58:50","name":"ipu3: Change sensor size selection policy","version":2,"mbox":"https://patchwork.libcamera.org/series/2328/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13273/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13273/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 39019BD87D\n\tfor ;\n\tTue, 10 Aug 2021 07:59:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E51AE687FA;\n\tTue, 10 Aug 2021 09:59:05 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D793D687DE\n\tfor ;\n\tTue, 10 Aug 2021 09:59:04 +0200 (CEST)","from perceval.ideasonboard.com (unknown [103.238.109.8])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A734DEE;\n\tTue, 10 Aug 2021 09:59:03 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"F0B6Ut1+\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628582344;\n\tbh=1XEI1fJ8n+4eb+I77B9m/UzjzNxJl5yljDMjF//fpsc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=F0B6Ut1+Zg20uFHAh51Brd1eG+5pSrp+wvegmdrS7nmoZhMCSz9FANxZ3k31MABot\n\tZVtmKkctQ1U8UAwBq76p6tTpc2jxrNqLaUWC/17ZzY6iTpynJYBsQM1V644ISGYkrb\n\tXBrcUNJ+QHHobEKp6iSaEgr8F7s3WC985QCxUGKE=","From":"Umang Jain ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 10 Aug 2021 13:28:51 +0530","Message-Id":"<20210810075854.86191-2-umang.jain@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210810075854.86191-1-umang.jain@ideasonboard.com>","References":"<20210810075854.86191-1-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 1/4] libcamera: camera_sensor:\n\tTransform CameraSensor::sizes()","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":"In CameraSensor, the mbusCodes() and sizes() accessor functions\nretrieves all the supported media bus codes and the supported sizes\nrespectively. However, this is quite limiting since the caller\nprobably isn't in a position to match which range of sizes are\nsupported for a particular mbusCode.\n\nHence, the caller is most likely interested to know about the sizes\nsupported for a particular media bus code. This patch transforms the\nexisting CameraSensor::sizes() to CameraSensor::sizes(mbuscode) to\nachieve that goal.\n\nThe patch also transforms existing CIO2Device::sizes() in IPU3 pipeline\nhandler to CIO2Device::sizes(PixelFormat) on a similar principle. The\nfunction is then plumbed to CameraSensor::sizes(mbusCode) to enumerate\nthe per-format sizes as required in\nPipelineHandlerIPU3::generateConfiguration().\n\nSigned-off-by: Umang Jain \nTested-by: Umang Jain \nTested-by: Jacopo Mondi \n---\n include/libcamera/internal/camera_sensor.h | 2 +-\n src/libcamera/camera_sensor.cpp | 25 ++++++++++++++++------\n src/libcamera/pipeline/ipu3/cio2.cpp | 20 ++++++++++++-----\n src/libcamera/pipeline/ipu3/cio2.h | 2 +-\n src/libcamera/pipeline/ipu3/ipu3.cpp | 2 +-\n test/camera-sensor.cpp | 2 +-\n 6 files changed, 38 insertions(+), 15 deletions(-)","diff":"diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\nindex db12b07e..d25a1165 100644\n--- a/include/libcamera/internal/camera_sensor.h\n+++ b/include/libcamera/internal/camera_sensor.h\n@@ -38,7 +38,7 @@ public:\n \tconst std::string &id() const { return id_; }\n \tconst MediaEntity *entity() const { return entity_; }\n \tconst std::vector &mbusCodes() const { return mbusCodes_; }\n-\tconst std::vector &sizes() const { return sizes_; }\n+\tconst std::vector sizes(unsigned int mbusCode) const;\n \tSize resolution() const;\n \tconst std::vector &testPatternModes() const\n \t{\ndiff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\nindex 7a386415..87668509 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -472,14 +472,27 @@ int CameraSensor::initProperties()\n */\n \n /**\n- * \\fn CameraSensor::sizes()\n- * \\brief Retrieve the frame sizes supported by the camera sensor\n+ * \\brief Retrieve the supported frame sizes for a media bus code\n+ * \\param[in] mbusCode The media bus code for which sizes are requested\n *\n- * The reported sizes span all media bus codes supported by the camera sensor.\n- * Not all sizes may be supported by all media bus codes.\n- *\n- * \\return The supported frame sizes sorted in increasing order\n+ * \\return The supported frame sizes for \\a mbusCode sorted in increasing order\n */\n+const std::vector CameraSensor::sizes(unsigned int mbusCode) const\n+{\n+\tstd::vector sizes;\n+\n+\tconst auto &format = formats_.find(mbusCode);\n+\tif (format == formats_.end())\n+\t\treturn sizes;\n+\n+\tconst std::vector &ranges = format->second;\n+\tstd::transform(ranges.begin(), ranges.end(), std::back_inserter(sizes),\n+\t\t [](const SizeRange &range) { return range.max; });\n+\n+\tstd::sort(sizes.begin(), sizes.end());\n+\n+\treturn sizes;\n+}\n \n /**\n * \\brief Retrieve the camera sensor resolution\ndiff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp\nindex 1bcd580e..8a40e955 100644\n--- a/src/libcamera/pipeline/ipu3/cio2.cpp\n+++ b/src/libcamera/pipeline/ipu3/cio2.cpp\n@@ -64,16 +64,26 @@ std::vector CIO2Device::formats() const\n * \\brief Retrieve the list of supported size ranges\n * \\return The list of supported SizeRange\n */\n-std::vector CIO2Device::sizes() const\n+std::vector CIO2Device::sizes(const PixelFormat &format) const\n {\n+\tstd::vector szRange;\n+\tint mbusCode = -1;\n+\n \tif (!sensor_)\n \t\treturn {};\n \n-\tstd::vector sizes;\n-\tfor (const Size &size : sensor_->sizes())\n-\t\tsizes.emplace_back(size, size);\n+\tfor (const auto &iter : mbusCodesToPixelFormat) {\n+\t\tif (iter.second == format)\n+\t\t\tmbusCode = iter.first;\n+\t}\n+\n+\tif (!mbusCode)\n+\t\treturn {};\n+\n+\tfor (const Size &sz: sensor_->sizes(mbusCode))\n+\t\tszRange.emplace_back(sz);\n \n-\treturn sizes;\n+\treturn szRange;\n }\n \n /**\ndiff --git a/src/libcamera/pipeline/ipu3/cio2.h b/src/libcamera/pipeline/ipu3/cio2.h\nindex f28e9f1d..24272dc5 100644\n--- a/src/libcamera/pipeline/ipu3/cio2.h\n+++ b/src/libcamera/pipeline/ipu3/cio2.h\n@@ -35,7 +35,7 @@ public:\n \tCIO2Device();\n \n \tstd::vector formats() const;\n-\tstd::vector sizes() const;\n+\tstd::vector sizes(const PixelFormat &format) const;\n \n \tint init(const MediaDevice *media, unsigned int index);\n \tint configure(const Size &size, V4L2DeviceFormat *outputFormat);\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 19cb5c4e..c73540fb 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -455,7 +455,7 @@ CameraConfiguration *PipelineHandlerIPU3::generateConfiguration(Camera *camera,\n \t\t\tbufferCount = cio2Config.bufferCount;\n \n \t\t\tfor (const PixelFormat &format : data->cio2_.formats())\n-\t\t\t\tstreamFormats[format] = data->cio2_.sizes();\n+\t\t\t\tstreamFormats[format] = data->cio2_.sizes(format);\n \n \t\t\tbreak;\n \t\t}\ndiff --git a/test/camera-sensor.cpp b/test/camera-sensor.cpp\nindex a8dcad82..372ee4af 100644\n--- a/test/camera-sensor.cpp\n+++ b/test/camera-sensor.cpp\n@@ -76,7 +76,7 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tconst std::vector &sizes = sensor_->sizes();\n+\t\tconst std::vector &sizes = sensor_->sizes(*iter);\n \t\tauto iter2 = std::find(sizes.begin(), sizes.end(),\n \t\t\t\t Size(4096, 2160));\n \t\tif (iter2 == sizes.end()) {\n","prefixes":["libcamera-devel","v2","1/4"]}