Patch Detail
Show a patch.
GET /api/patches/21427/?format=api
{ "id": 21427, "url": "https://patchwork.libcamera.org/api/patches/21427/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21427/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "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-3-naush@raspberrypi.com>", "date": "2024-09-30T14:14:10", "name": "[v2,2/7] pipeline: rpi: Remove CameraData::scalerCrop_", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "87d97381fccae6f2435285089603c50121ec6707", "submitter": { "id": 34, "url": "https://patchwork.libcamera.org/api/people/34/?format=api", "name": "Naushir Patuck", "email": "naush@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21427/mbox/", "series": [ { "id": 4639, "url": "https://patchwork.libcamera.org/api/series/4639/?format=api", "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/21427/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21427/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 9E0BEC32D4\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 30 Sep 2024 14:14:07 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5ABCD63516;\n\tMon, 30 Sep 2024 16:14:02 +0200 (CEST)", "from mail-wm1-x334.google.com (mail-wm1-x334.google.com\n\t[IPv6:2a00:1450:4864:20::334])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7196763502\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 30 Sep 2024 16:13:59 +0200 (CEST)", "by mail-wm1-x334.google.com with SMTP id\n\t5b1f17b1804b1-42f5a663ed5so4354655e9.0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 30 Sep 2024 07:13:59 -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.57\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 30 Sep 2024 07:13:58 -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=\"XcQ31T/W\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1727705639; x=1728310439;\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=9+m41jvKqkJNcbigGAyNEkXfOS5vdXGwZcA9O2yM+Fc=;\n\tb=XcQ31T/WSNFk8LrpqbBA8ysSFLW+9yy10FlTZrRvzntxzUtbcmeS2a7x3gnLSYnnk3\n\tuWLPAELE8ZSjF07BemdwOhLTzFwaWUGLhZ6lwo/Qk9NXupowleAwuAiqBDl/d3nrKlhF\n\tfsUkBE6/RLh75PU+yBeTVT1uqGXRTNLlrBflaKdLsciTwHNFL+B5/p7sapHN2jbOqX6o\n\txtcJMhTjy+uDaJXcj0q5396zZgIv932M8vX3zj/0RCGTeW0tvRJeDr9MvYt4ISOsckAT\n\tqKGK6vp0KtJB8As2VKmingaAi3BjyWVkJs1ogZQyYyQVkBQTI8owMmxeoBuoZxDKQ3CN\n\t5EPQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1727705639; x=1728310439;\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=9+m41jvKqkJNcbigGAyNEkXfOS5vdXGwZcA9O2yM+Fc=;\n\tb=Sbcc1ZvRBhfbIZEmbEaRcTQ5jILU0oN0Pb91gEowW6l3Jh36PkwGKiou2C5kJtgzZB\n\tCmwQmZ+IoD0LosCJdPxOp6qiqbRzVAFcAPzEL/Yz2iFXwQH2OM3dFTIDYmqT3qIF7bDw\n\twVMn4YNK9wsWYumL61mPqeBELQKEcbWUxBngKOBMetQo0sDxsblN+hMhF4MFfNIC1SZ0\n\t8P3ZAyxRDYAoBTNL4h1saVVXEPOyG7uaeUa5WdZyxGnlyS9I5aLhtqhKf32/TEUwA8TZ\n\tG0w93vxDtM2ZlXbwGF3r7V6FFi8pRbUxkE09KhNmZXB7VkO9rtSX1VTd+Uougs2Yo7bD\n\txFJA==", "X-Gm-Message-State": "AOJu0YzrlFl9jeRo/hDmGOFFeBTIa7jgVkTwwSzaS6y31trdt7WIij5H\n\tkhNpo9ear7WudrEO3eAabjsW0ZnEBW9vJYVIUDWtBjZVpECNRBpjA2SVETcDX20emROWLwRAp+U\n\tA", "X-Google-Smtp-Source": "AGHT+IEBvRrrlXiwX9/Z/UvkfQHGc8Z+SH/gzvgJivJPObfS7dzZhfue9WelhHjvaBaTgW8uybKt+w==", "X-Received": "by 2002:a05:600c:350f:b0:42c:ba61:d20b with SMTP id\n\t5b1f17b1804b1-42f58416273mr40066985e9.3.1727705638620; \n\tMon, 30 Sep 2024 07:13:58 -0700 (PDT)", "From": "Naushir Patuck <naush@raspberrypi.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Naushir Patuck <naush@raspberrypi.com>,\n\tLaurent Pinchart <laurent.pinchart@ideasonboard.com>", "Subject": "[PATCH v2 2/7] pipeline: rpi: Remove CameraData::scalerCrop_", "Date": "Mon, 30 Sep 2024 15:14:10 +0100", "Message-Id": "<20240930141415.8857-3-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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Do not cache the scalerCrop_ parameter. The cached value is used to\nupdate the request metadata, but since this is not an expensive\noperation (and can only occur once per frame), caching it is of limited\nvalue.\n\nThis will simplify logic in a future commit where we can specify a\ncrop per-output stream.\n\nSigned-off-by: Naushir Patuck <naush@raspberrypi.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n .../pipeline/rpi/common/pipeline_base.cpp | 18 +++---------------\n .../pipeline/rpi/common/pipeline_base.h | 1 -\n 2 files changed, 3 insertions(+), 16 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\nindex 3041fd1ed9fd..11f1bfd4a5da 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n@@ -544,12 +544,6 @@ int PipelineHandlerBase::configure(Camera *camera, CameraConfiguration *config)\n \t\treturn ret;\n \t}\n \n-\t/*\n-\t * Set the scaler crop to the value we are using (scaled to native sensor\n-\t * coordinates).\n-\t */\n-\tdata->scalerCrop_ = data->scaleIspCrop(data->ispCrop_);\n-\n \t/*\n \t * Update the ScalerCropMaximum to the correct value for this camera mode.\n \t * For us, it's the same as the \"analogue crop\".\n@@ -569,7 +563,8 @@ int PipelineHandlerBase::configure(Camera *camera, CameraConfiguration *config)\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, data->scalerCrop_);\n+\tctrlMap[&controls::ScalerCrop] = ControlInfo(ispMinCrop, data->sensorInfo_.analogCrop,\n+\t\t\t\t\t\t data->scaleIspCrop(data->ispCrop_));\n \n \tdata->controlInfo_ = ControlInfoMap(std::move(ctrlMap), result.controlInfo.idmap());\n \n@@ -1320,13 +1315,6 @@ void CameraData::applyScalerCrop(const ControlList &controls)\n \t\tif (ispCrop != ispCrop_) {\n \t\t\tispCrop_ = ispCrop;\n \t\t\tplatformSetIspCrop();\n-\n-\t\t\t/*\n-\t\t\t * Also update the ScalerCrop in the metadata with what we actually\n-\t\t\t * used. But we must first rescale that from ISP (camera mode) pixels\n-\t\t\t * back into sensor native pixels.\n-\t\t\t */\n-\t\t\tscalerCrop_ = scaleIspCrop(ispCrop_);\n \t\t}\n \t}\n }\n@@ -1483,7 +1471,7 @@ 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, scalerCrop_);\n+\trequest->metadata().set(controls::ScalerCrop, scaleIspCrop(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 f9cecf70f179..5161c16e518f 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.h\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.h\n@@ -134,7 +134,6 @@ public:\n \t/* For handling digital zoom. */\n \tIPACameraSensorInfo sensorInfo_;\n \tRectangle ispCrop_; /* crop in ISP (camera mode) pixels */\n-\tRectangle scalerCrop_; /* crop in sensor native pixels */\n \tSize ispMinCropSize_;\n \n \tunsigned int dropFrameCount_;\n", "prefixes": [ "v2", "2/7" ] }