{"id":20836,"url":"https://patchwork.libcamera.org/api/patches/20836/?format=json","web_url":"https://patchwork.libcamera.org/patch/20836/","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":"<20240808102346.13065-5-naush@raspberrypi.com>","date":"2024-08-08T10:23:43","name":"[v1,4/7] pipeline: rpi: Introduce CameraData::CropParams","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"6c5d7ff3f76b0555d00689524a732aa88c3a30f0","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/people/34/?format=json","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/20836/mbox/","series":[{"id":4501,"url":"https://patchwork.libcamera.org/api/series/4501/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4501","date":"2024-08-08T10:23:39","name":"Raspberry Pi: Add controls::rpi::ScalerCrops","version":1,"mbox":"https://patchwork.libcamera.org/series/4501/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/20836/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/20836/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 0CE6BC32D6\n\tfor ;\n\tThu, 8 Aug 2024 10:24:03 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 80789633B4;\n\tThu, 8 Aug 2024 12:24:01 +0200 (CEST)","from mail-lf1-x131.google.com (mail-lf1-x131.google.com\n\t[IPv6:2a00:1450:4864:20::131])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F3E90633B3\n\tfor ;\n\tThu, 8 Aug 2024 12:23:49 +0200 (CEST)","by mail-lf1-x131.google.com with SMTP id\n\t2adb3069b0e04-52f01b8738dso615477e87.1\n\tfor ;\n\tThu, 08 Aug 2024 03:23:49 -0700 (PDT)","from naush-laptop.pitowers.org ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\tffacd0b85a97d-36d272290c2sm1404234f8f.92.2024.08.08.03.23.47\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 08 Aug 2024 03:23:47 -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=\"EKQdKb7p\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1723112629; x=1723717429;\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=udLn4pl0gbPuXta+jTkKmxnNGVbdVMnTNow0Ki0JMVw=;\n\tb=EKQdKb7pibM9yyiE1WwDgzIM+J1Wrr3GXF1LhLMpPtXT88ev3hqaPwkeKqCW903jWI\n\tBEm2wVXcGHCASScx1lDodxHj8tG8YOj6v04q+Nx+jtH5hXjH8iDP8pW5Oed0gmCjuRvz\n\tCddh/QD/VMgRDL9CUSn1JlYhQ1aXzhkjOYpFZll+kdfV4qWWjtOn1+OiQg4CyVrrwYo9\n\teVGK7hWhouNj0xkku3wEw7VU1SwtQqCPY8ner3UVvqMuWu9C25ooclmnhKenI9OmIPwI\n\tHWGo8CjJ5O1hUXQO4ejHAZbbh/E72FgMRpzw54oZzy4DtO/BHungT01mHooDmPKHXtOs\n\t3Lgg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1723112629; x=1723717429;\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=udLn4pl0gbPuXta+jTkKmxnNGVbdVMnTNow0Ki0JMVw=;\n\tb=JOC6XKRNXvo0ywAfaTuh5WkEAUYQf9OZTdDqWOMvnBudnB8rv4Cu4Dan82vnR0i6JK\n\tNagOQqV7Awy9yHvefFOu8pRS9tuJvZaO5GjNL7zjxv6mDL46qHqiTSjneDibP/mnv1tz\n\tR3OqbiYB0Ec5ofJEkju4Jjk1lHkWKI1Q/jgSqTSWjQEUfZeGB1jLJWA3EpJ6nEzjRm7C\n\tcG1fLH9NLKeK/aKknX2rH+3wFr3Y29LvkcA4uXJSK1xZD+If11jH+y+59inPTQTo0LMS\n\t/yPTaCMI2Ave4sNiJU1QkkStzyCU7BAAi0F24MZYxarUwnLtn9NkzpCRwffYGVbSHccR\n\tcVXA==","X-Gm-Message-State":"AOJu0YzkMtN2ZcJkwFGWDMFrKzl0O4VIQZ2Np09p49KcM0Uh7uGmURGt\n\tLlv7MEwtthl2LcflYC1B4Bra1ytlo4ch/GUaJx1iFz1SOIrXTV3KJXLyv4FgjcItli2Im3a1r+u\n\tx","X-Google-Smtp-Source":"AGHT+IEz8y4uHvVJv+XWKKqm0330tldGJlTx+mcpbOx/p3BYhOKpZU/t2NzjsFM5pJfs3+i0cvnKjA==","X-Received":"by 2002:a05:6512:3e0d:b0:52c:df6d:e52e with SMTP id\n\t2adb3069b0e04-530e582d6acmr1140484e87.16.1723112628283; \n\tThu, 08 Aug 2024 03:23:48 -0700 (PDT)","From":"Naushir Patuck ","To":"libcamera-devel@lists.libcamera.org","Cc":"Naushir Patuck ","Subject":"[PATCH v1 4/7] pipeline: rpi: Introduce CameraData::CropParams","Date":"Thu, 8 Aug 2024 11:23:43 +0100","Message-Id":"<20240808102346.13065-5-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20240808102346.13065-1-naush@raspberrypi.com>","References":"<20240808102346.13065-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 \n---\n .../pipeline/rpi/common/pipeline_base.cpp | 23 +++++++++++--------\n .../pipeline/rpi/common/pipeline_base.h | 21 +++++++++++++++--\n src/libcamera/pipeline/rpi/vc4/vc4.cpp | 13 ++++++++---\n 3 files changed, 43 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..412e71648231 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n@@ -561,10 +561,12 @@ 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+\tif (data->cropParams_.count(0)) {\n+\t\t/* Add the ScalerCrop control limits based on the current mode. */\n+\t\tRectangle ispMinCrop = data->scaleIspCrop(Rectangle(data->cropParams_[0].ispMinCropSize));\n+\t\tctrlMap[&controls::ScalerCrop] = ControlInfo(ispMinCrop, data->sensorInfo_.analogCrop,\n+\t\t\t\t\t\t\t data->scaleIspCrop(data->cropParams_[0].ispCrop));\n+\t}\n \n \tdata->controlInfo_ = ControlInfoMap(std::move(ctrlMap), result.controlInfo.idmap());\n \n@@ -1291,7 +1293,8 @@ 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+\tif (scalerCrop && cropParams_.count(0)) {\n+\t\tCropParams &cropParams = cropParams_[0];\n \t\tRectangle nativeCrop = *scalerCrop;\n \n \t\tif (!nativeCrop.width || !nativeCrop.height)\n@@ -1308,12 +1311,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 +1474,9 @@ 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+\tif (cropParams_.count(0))\n+\t\trequest->metadata().set(controls::ScalerCrop,\n+\t\t\t\t\tscaleIspCrop(cropParams_[0].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..2bed905178bc 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 stream index 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..d118252f02dd 100644\n--- a/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n+++ b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n@@ -702,13 +702,20 @@ 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_.clear();\n+\tcropParams_.emplace(std::piecewise_construct,\n+\t\t\t std::forward_as_tuple(0),\n+\t\t\t std::forward_as_tuple(scaleIspCrop(ispCrop), testCrop.size()));\n \n \treturn 0;\n }\n","prefixes":["v1","4/7"]}