{"id":21429,"url":"https://patchwork.libcamera.org/api/1.1/patches/21429/?format=json","web_url":"https://patchwork.libcamera.org/patch/21429/","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":"<20240930141415.8857-5-naush@raspberrypi.com>","date":"2024-09-30T14:14:12","name":"[v2,4/7] pipeline: rpi: Introduce CameraData::CropParams","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"caffe35c58265c9d70120abf715b78e3bc4f52df","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/1.1/people/34/?format=json","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21429/mbox/","series":[{"id":4639,"url":"https://patchwork.libcamera.org/api/1.1/series/4639/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4639","date":"2024-09-30T14:14:08","name":"Raspberry Pi: Add controls::rpi::ScalerCrops","version":2,"mbox":"https://patchwork.libcamera.org/series/4639/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21429/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21429/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 9505FC32D4\n\tfor ;\n\tMon, 30 Sep 2024 14:14:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 371A46351A;\n\tMon, 30 Sep 2024 16:14:10 +0200 (CEST)","from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com\n\t[IPv6:2a00:1450:4864:20::32d])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D80106351E\n\tfor ;\n\tMon, 30 Sep 2024 16:14:01 +0200 (CEST)","by mail-wm1-x32d.google.com with SMTP id\n\t5b1f17b1804b1-42ca4e0014dso5941945e9.2\n\tfor ;\n\tMon, 30 Sep 2024 07:14:01 -0700 (PDT)","from naush-laptop.pitowers.org ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\tffacd0b85a97d-37cd56e65c3sm9142524f8f.60.2024.09.30.07.13.59\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 30 Sep 2024 07:14:00 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"N5uYPbGV\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1727705641; x=1728310441;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=hK15FfCcZU6znAebgYoIiMQvQPDECUqm2aTM2ldSG6M=;\n\tb=N5uYPbGVG3ZWSQiw8aZbUp17yEm+yOnX8HjRDlycI527JTQsMzR6j9cNs0iILtRusG\n\t1Bs+GTRBEVcWxh9/jOKskO3Q0xaWswlpfNTjP3Wyj5VKjt/J188RI0vkB8uW2SiBttmo\n\tw/9odMvRu9MAboZPJUVSWT1M5a67aSTUkyEWjSu6dA1ddHiX3z1Y7ZmpOGU2Bx3/xqVl\n\tIm3svhujvWEnPgciV5ABP2dlPHNlEfiNvegocYxUca9oPP6YrwWsTQtE9N92mVHtGzTO\n\tluNu7/v7qn5GATOLPNBbv58VUBmGyhRZTLaMZiBR50ma0MoiSM5wx8D98v3GOuNmydjQ\n\tkLig==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1727705641; x=1728310441;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=hK15FfCcZU6znAebgYoIiMQvQPDECUqm2aTM2ldSG6M=;\n\tb=kigMtu/6vG61ry6NJ9ePx4w46EkNYtM+hgRiXsjSkQjeHeqvTdc10sJ3IHg2gilRsj\n\t8PjqFDYPEK+y4kB9aNh+yEL2vsvJon5TtxGB/81uDha/O+VEBaWlGN4x8Uae9tAZeUCq\n\t5YZ5tyfV8JVXmsO0FMHVtFoInfEcfLzllhfGNHmEiMEHAyC15P+MBWF7C+YHoKHL0oTq\n\tXm3hMsw2u5NUjqHz3urD/edXdWeRulc/JFQtdmQ2wou+bnuV8empFFM709w/ihw2iXds\n\tbIxkXeD6TkeiJhmOuYoYb24wzkcGh2DEZS5RHheoduXpTYIEGaLLyEG2jzM7zVUBB+ye\n\t/aKg==","X-Gm-Message-State":"AOJu0YyQ9p6h4BIPN8xvqYGt5DWG1D6vFjyqkhgoNukLky5EiqIESczn\n\t7LrP8Q/BQYReo3U1GbO0hHdLYjUGw090iI0uZV2cgfi6wkgytPZCAWU8wGOoUqSwSUb51oMbrnw\n\tc","X-Google-Smtp-Source":"AGHT+IHRboinuZhNHPCEwmpLBlTA0FJ1mV/iVvWbbwypghPBAOh7gs3/obqDDr2RfMU3wj50OiZ+OA==","X-Received":"by 2002:a05:600c:3145:b0:42c:df54:18f6 with SMTP id\n\t5b1f17b1804b1-42f5e38b8d9mr28227495e9.3.1727705640924; \n\tMon, 30 Sep 2024 07:14:00 -0700 (PDT)","From":"Naushir Patuck ","To":"libcamera-devel@lists.libcamera.org","Cc":"Naushir Patuck ,\n\tLaurent Pinchart ","Subject":"[PATCH v2 4/7] pipeline: rpi: Introduce CameraData::CropParams","Date":"Mon, 30 Sep 2024 15:14:12 +0100","Message-Id":"<20240930141415.8857-5-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20240930141415.8857-1-naush@raspberrypi.com>","References":"<20240930141415.8857-1-naush@raspberrypi.com>","MIME-Version":"1.0","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":"In preparation for assigning separate crop windows for each stream, add\na new CropParams structure that stores the existing ispCrop_ and\nispMinCropSize_ as fields. Use a new std::map to store a CropParams\nstructure where the map key is the index of the stream configuration in\nthe CameraConfiguration vector.\n\nAt preset, only a single CropParams structure will be set at key == 0 to\npreserve the existing crop handling logic.\n\nSigned-off-by: Naushir Patuck \nReviewed-by: Laurent Pinchart \n---\n .../pipeline/rpi/common/pipeline_base.cpp | 28 +++++++++++++------\n .../pipeline/rpi/common/pipeline_base.h | 21 ++++++++++++--\n src/libcamera/pipeline/rpi/vc4/vc4.cpp | 12 ++++++--\n 3 files changed, 47 insertions(+), 14 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\nindex 2de6111bacfd..220c7b962280 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n@@ -533,6 +533,7 @@ int PipelineHandlerBase::configure(Camera *camera, CameraConfiguration *config)\n \t * Platform specific internal stream configuration. This also assigns\n \t * external streams which get configured below.\n \t */\n+\tdata->cropParams_.clear();\n \tret = data->platformConfigure(rpiConfig);\n \tif (ret)\n \t\treturn ret;\n@@ -561,10 +562,14 @@ int PipelineHandlerBase::configure(Camera *camera, CameraConfiguration *config)\n \tfor (auto const &c : result.controlInfo)\n \t\tctrlMap.emplace(c.first, c.second);\n \n-\t/* Add the ScalerCrop control limits based on the current mode. */\n-\tRectangle ispMinCrop = data->scaleIspCrop(Rectangle(data->ispMinCropSize_));\n-\tctrlMap[&controls::ScalerCrop] = ControlInfo(ispMinCrop, data->sensorInfo_.analogCrop,\n-\t\t\t\t\t\t data->scaleIspCrop(data->ispCrop_));\n+\tconst auto cropParamsIt = data->cropParams_.find(0);\n+\tif (cropParamsIt != data->cropParams_.end()) {\n+\t\tconst CameraData::CropParams &cropParams = cropParamsIt->second;\n+\t\t/* Add the ScalerCrop control limits based on the current mode. */\n+\t\tRectangle ispMinCrop = data->scaleIspCrop(Rectangle(cropParams.ispMinCropSize));\n+\t\tctrlMap[&controls::ScalerCrop] = ControlInfo(ispMinCrop, data->sensorInfo_.analogCrop,\n+\t\t\t\t\t\t\t data->scaleIspCrop(cropParams.ispCrop));\n+\t}\n \n \tdata->controlInfo_ = ControlInfoMap(std::move(ctrlMap), result.controlInfo.idmap());\n \n@@ -1291,8 +1296,10 @@ Rectangle CameraData::scaleIspCrop(const Rectangle &ispCrop) const\n void CameraData::applyScalerCrop(const ControlList &controls)\n {\n \tconst auto &scalerCrop = controls.get(controls::ScalerCrop);\n-\tif (scalerCrop) {\n+\tconst auto cropParamsIt = cropParams_.find(0);\n+\tif (scalerCrop && cropParamsIt != cropParams_.end()) {\n \t\tRectangle nativeCrop = *scalerCrop;\n+\t\tCropParams &cropParams = cropParamsIt->second;\n \n \t\tif (!nativeCrop.width || !nativeCrop.height)\n \t\t\tnativeCrop = { 0, 0, 1, 1 };\n@@ -1308,12 +1315,12 @@ void CameraData::applyScalerCrop(const ControlList &controls)\n \t\t * 2. With the same mid-point, if possible.\n \t\t * 3. But it can't go outside the sensor area.\n \t\t */\n-\t\tSize minSize = ispMinCropSize_.expandedToAspectRatio(nativeCrop.size());\n+\t\tSize minSize = cropParams.ispMinCropSize.expandedToAspectRatio(nativeCrop.size());\n \t\tSize size = ispCrop.size().expandedTo(minSize);\n \t\tispCrop = size.centeredTo(ispCrop.center()).enclosedIn(Rectangle(sensorInfo_.outputSize));\n \n-\t\tif (ispCrop != ispCrop_) {\n-\t\t\tispCrop_ = ispCrop;\n+\t\tif (ispCrop != cropParams.ispCrop) {\n+\t\t\tcropParams.ispCrop = ispCrop;\n \t\t\tplatformSetIspCrop(ispCrop);\n \t\t}\n \t}\n@@ -1471,7 +1478,10 @@ void CameraData::fillRequestMetadata(const ControlList &bufferControls, Request\n \trequest->metadata().set(controls::SensorTimestamp,\n \t\t\t\tbufferControls.get(controls::SensorTimestamp).value_or(0));\n \n-\trequest->metadata().set(controls::ScalerCrop, scaleIspCrop(ispCrop_));\n+\tconst auto cropParamsIt = cropParams_.find(0);\n+\tif (cropParamsIt != cropParams_.end())\n+\t\trequest->metadata().set(controls::ScalerCrop,\n+\t\t\t\t\tscaleIspCrop(cropParamsIt->second.ispCrop));\n }\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.h b/src/libcamera/pipeline/rpi/common/pipeline_base.h\nindex d65b695c30b5..75babbe17f31 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.h\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.h\n@@ -133,8 +133,25 @@ public:\n \n \t/* For handling digital zoom. */\n \tIPACameraSensorInfo sensorInfo_;\n-\tRectangle ispCrop_; /* crop in ISP (camera mode) pixels */\n-\tSize ispMinCropSize_;\n+\n+\tstruct CropParams {\n+\t\tCropParams(Rectangle ispCrop_, Size ispMinCropSize_)\n+\t\t\t: ispCrop(ispCrop_), ispMinCropSize(ispMinCropSize_)\n+\t\t{\n+\t\t}\n+\n+\t\tCropParams()\n+\t\t{\n+\t\t}\n+\n+\t\t/* Crop in ISP (camera mode) pixels */\n+\t\tRectangle ispCrop;\n+\t\t/* Minimum crop size in ISP output pixels */\n+\t\tSize ispMinCropSize;\n+\t};\n+\n+\t/* Mapping of CropParams keyed by the output stream order in CameraConfiguration */\n+\tstd::map cropParams_;\n \n \tunsigned int dropFrameCount_;\n \ndiff --git a/src/libcamera/pipeline/rpi/vc4/vc4.cpp b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\nindex 0ea032293bc9..8080f55a1cf4 100644\n--- a/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n+++ b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n@@ -702,13 +702,19 @@ int Vc4CameraData::platformConfigure(const RPi::RPiCameraConfiguration *rpiConfi\n \t/* Figure out the smallest selection the ISP will allow. */\n \tRectangle testCrop(0, 0, 1, 1);\n \tisp_[Isp::Input].dev()->setSelection(V4L2_SEL_TGT_CROP, &testCrop);\n-\tispMinCropSize_ = testCrop.size();\n \n \t/* Adjust aspect ratio by providing crops on the input image. */\n \tSize size = unicamFormat.size.boundedToAspectRatio(maxSize);\n-\tispCrop_ = size.centeredTo(Rectangle(unicamFormat.size).center());\n+\tRectangle ispCrop = size.centeredTo(Rectangle(unicamFormat.size).center());\n \n-\tplatformSetIspCrop(ispCrop_);\n+\tplatformSetIspCrop(ispCrop);\n+\t/*\n+\t * Set the scaler crop to the value we are using (scaled to native sensor\n+\t * coordinates).\n+\t */\n+\tcropParams_.emplace(std::piecewise_construct,\n+\t\t\t std::forward_as_tuple(0),\n+\t\t\t std::forward_as_tuple(ispCrop, testCrop.size()));\n \n \treturn 0;\n }\n","prefixes":["v2","4/7"]}