{"id":9594,"url":"https://patchwork.libcamera.org/api/1.1/patches/9594/?format=json","web_url":"https://patchwork.libcamera.org/patch/9594/","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":"<20200914142149.63857-3-niklas.soderlund@ragnatech.se>","date":"2020-09-14T14:21:38","name":"[libcamera-devel,v2,02/13] libcamera: pipeline: rkisp1: Breakout mainpath size and format constraints","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"e83f2954b656a6f6cffbc1d11045e81e902afa58","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/9594/mbox/","series":[{"id":1289,"url":"https://patchwork.libcamera.org/api/1.1/series/1289/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1289","date":"2020-09-14T14:21:36","name":"libcamera: pipeline: rkisp1: Extend to support two streams","version":2,"mbox":"https://patchwork.libcamera.org/series/1289/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9594/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9594/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 A11B0BF01C\n\tfor ;\n\tMon, 14 Sep 2020 14:22:08 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7BBAB62E0A;\n\tMon, 14 Sep 2020 16:22:08 +0200 (CEST)","from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4956362C8C\n\tfor ;\n\tMon, 14 Sep 2020 16:22:07 +0200 (CEST)","from bismarck.berto.se (p54ac52a8.dip0.t-ipconnect.de\n\t[84.172.82.168]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid aa2534ad-f695-11ea-a39b-005056917f90;\n\tMon, 14 Sep 2020 16:22:06 +0200 (CEST)"],"X-Halon-ID":"aa2534ad-f695-11ea-a39b-005056917f90","Authorized-sender":"niklas.soderlund@fsdn.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 14 Sep 2020 16:21:38 +0200","Message-Id":"<20200914142149.63857-3-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20200914142149.63857-1-niklas.soderlund@ragnatech.se>","References":"<20200914142149.63857-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 02/13] libcamera: pipeline: rkisp1:\n\tBreakout mainpath size and format constraints","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":"Breakout the mainpath size and format constrains as it will be used in\nmore places then just validate(). While at it use the new helpers to\nvalidate Size.\n\nSigned-off-by: Niklas Söderlund \nReviewed-by: Jacopo Mondi \nReviewed-by: Kieran Bingham \n---\n* Changes since v1\n- Use list initializers\n- Use constexpr instead of static const\n- Define constants in anonymoys namespace\n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 34 +++++++++++++-----------\n 1 file changed, 19 insertions(+), 15 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 009d190d3ec828f0..86a3e3c63b17762b 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -37,6 +37,21 @@ namespace libcamera {\n \n LOG_DEFINE_CATEGORY(RkISP1)\n \n+namespace {\n+\tconstexpr Size RKISP1_RSZ_MP_SRC_MIN { 32, 16 };\n+\tconstexpr Size RKISP1_RSZ_MP_SRC_MAX { 4416, 3312 };\n+\tconstexpr std::array RKISP1_RSZ_MP_FORMATS{\n+\t\tformats::YUYV,\n+\t\tformats::YVYU,\n+\t\tformats::VYUY,\n+\t\tformats::NV16,\n+\t\tformats::NV61,\n+\t\tformats::NV21,\n+\t\tformats::NV12,\n+\t\t/* \\todo Add support for 8-bit greyscale to DRM formats */\n+\t};\n+}\n+\n class PipelineHandlerRkISP1;\n class RkISP1ActionQueueBuffers;\n \n@@ -461,17 +476,6 @@ RkISP1CameraConfiguration::RkISP1CameraConfiguration(Camera *camera,\n \n CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n {\n-\tstatic const std::array formats{\n-\t\tformats::YUYV,\n-\t\tformats::YVYU,\n-\t\tformats::VYUY,\n-\t\tformats::NV16,\n-\t\tformats::NV61,\n-\t\tformats::NV21,\n-\t\tformats::NV12,\n-\t\t/* \\todo Add support for 8-bit greyscale to DRM formats */\n-\t};\n-\n \tconst CameraSensor *sensor = data_->sensor_;\n \tStatus status = Valid;\n \n@@ -487,8 +491,8 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n \tStreamConfiguration &cfg = config_[0];\n \n \t/* Adjust the pixel format. */\n-\tif (std::find(formats.begin(), formats.end(), cfg.pixelFormat) ==\n-\t formats.end()) {\n+\tif (std::find(RKISP1_RSZ_MP_FORMATS.begin(), RKISP1_RSZ_MP_FORMATS.end(),\n+\t\t cfg.pixelFormat) == RKISP1_RSZ_MP_FORMATS.end()) {\n \t\tLOG(RkISP1, Debug) << \"Adjusting format to NV12\";\n \t\tcfg.pixelFormat = formats::NV12,\n \t\tstatus = Adjusted;\n@@ -525,8 +529,8 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n \t\t\t\t/ sensorFormat_.size.width;\n \t}\n \n-\tcfg.size.width = std::max(32U, std::min(4416U, cfg.size.width));\n-\tcfg.size.height = std::max(16U, std::min(3312U, cfg.size.height));\n+\tcfg.size.boundTo(RKISP1_RSZ_MP_SRC_MAX);\n+\tcfg.size.expandTo(RKISP1_RSZ_MP_SRC_MIN);\n \n \tif (cfg.size != size) {\n \t\tLOG(RkISP1, Debug)\n","prefixes":["libcamera-devel","v2","02/13"]}