Patch Detail
Show a patch.
GET /api/patches/21492/?format=api
{ "id": 21492, "url": "https://patchwork.libcamera.org/api/patches/21492/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21492/", "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": "<20241003074720.18882-7-naush@raspberrypi.com>", "date": "2024-10-03T07:47:19", "name": "[v3,6/7] pipeline: rpi: Pass ISP output index into platformSetIspCrop()", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "9fbf745d22b344ba15962149d4393a911d6abc0b", "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/21492/mbox/", "series": [ { "id": 4651, "url": "https://patchwork.libcamera.org/api/series/4651/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4651", "date": "2024-10-03T07:47:13", "name": "Raspberry Pi: Add controls::rpi::ScalerCrops", "version": 3, "mbox": "https://patchwork.libcamera.org/series/4651/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21492/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21492/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 3A983C3263\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 3 Oct 2024 07:54:03 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 85B2163525;\n\tThu, 3 Oct 2024 09:54:01 +0200 (CEST)", "from mail-wm1-x333.google.com (mail-wm1-x333.google.com\n\t[IPv6:2a00:1450:4864:20::333])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 24DD46352D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 3 Oct 2024 09:53:50 +0200 (CEST)", "by mail-wm1-x333.google.com with SMTP id\n\t5b1f17b1804b1-42cb0d0311fso797625e9.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 03 Oct 2024 00:53:50 -0700 (PDT)", "from naush-laptop.pitowers.org ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\t5b1f17b1804b1-42f8025b583sm8740825e9.12.2024.10.03.00.53.48\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 03 Oct 2024 00:53:48 -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=\"rjZa180l\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1727942029; x=1728546829;\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=KemNgYMBW8186eLynbOGC1vQGWAH0T0PqLUvHvsVvSM=;\n\tb=rjZa180lsOn3j+16nwd8G4vKcPGkX+h+nSm47gKj1YWynRfp2BAKtjPPfaONr+ySLp\n\t0Uk7gMljfAmBSGuThzt3iwCsSjgH5sCDRYlOqxbi5o3sZ8PJJCf3QRWg67VgiwvxJPxk\n\tDruJHPdyQx5K89ReaWDUXNss4EodiTNSnDsLRE8znATi94BHNr0SsnbqwwF8nugHFSdo\n\tMHGRUGwwOKtMs/cMY4qYL3wW7gCUcJby+/vpvwvmauUGO/iMPXlri++GEWBw1Y9SGarq\n\tm+VbpWl35E9mfNPVLhX9BEnhB4zOmV9779XmTGvl1tBD79s9z5rUoH8CdPImCtOo4ad7\n\tMqLg==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1727942029; x=1728546829;\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=KemNgYMBW8186eLynbOGC1vQGWAH0T0PqLUvHvsVvSM=;\n\tb=SmcTFbp4kXkxRNk5vpfZSYu/fRxL68DYESbXzB/QLagDDYOjlp9RrmNiP+q2a5eBY7\n\tSerHb8VYkHtxdfwOgbGvnhLK+v1vWTwg7n/o3Cnnwc8kpJypz1FvdDmgjAAf+Bo7j3hH\n\t0nh3F7AFYyyfMecYLBqN9bHEb2zFWoQZWKHYHc98IHZ+QH1rNM+bPbp46pDRNrhN36+B\n\tHP0e1UQ5MovyIIz0pyCSsT+zwn1zViTzLEzHfsiBcjOJK5aGXKUHCxexhHBVraiz5OQq\n\t1mdYI+Sg2hoZp6nmERcLerLLM4DrDLFC11O2hvsX2Bofe2TbQre4FUthoXnar8CVScXw\n\t+sOw==", "X-Gm-Message-State": "AOJu0Yx7pcK3fAnSDSdGG64xNp5byhTY+81eu18VBPqw3OWiaFWr2i+W\n\tXYdlFyvCwR0QqWhzZstVbNyUvqR+anpM3z4XbFva09yvfmTjQC/63fRwkNykpIq3Wi8qEz7Pssy\n\tQ", "X-Google-Smtp-Source": "AGHT+IGtUUmUoxZajtIDfK46wOvyoL8JBuAtWUI6H7NYxYY4yTvraNd1kikvzohqJwXu9n6n+4ztQw==", "X-Received": "by 2002:a05:600c:1d26:b0:42c:bfd6:9d1f with SMTP id\n\t5b1f17b1804b1-42f777b010bmr21671845e9.1.1727942029335; \n\tThu, 03 Oct 2024 00:53:49 -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>,\n\tJacopo Mondi <jacopo.mondi@ideasonboard.com>", "Subject": "[PATCH v3 6/7] pipeline: rpi: Pass ISP output index into\n\tplatformSetIspCrop()", "Date": "Thu, 3 Oct 2024 08:47:19 +0100", "Message-Id": "<20241003074720.18882-7-naush@raspberrypi.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20241003074720.18882-1-naush@raspberrypi.com>", "References": "<20241003074720.18882-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": "At this point, the index is unused, but will be in a future commit where\nwe can set different crops on each ISP output.\n\nSigned-off-by: Naushir Patuck <naush@raspberrypi.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\n---\n src/libcamera/pipeline/rpi/common/pipeline_base.cpp | 2 +-\n src/libcamera/pipeline/rpi/common/pipeline_base.h | 2 +-\n src/libcamera/pipeline/rpi/vc4/vc4.cpp | 4 ++--\n 3 files changed, 4 insertions(+), 4 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\nindex 220c7b962280..267e6bd9cd70 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n@@ -1321,7 +1321,7 @@ void CameraData::applyScalerCrop(const ControlList &controls)\n \n \t\tif (ispCrop != cropParams.ispCrop) {\n \t\t\tcropParams.ispCrop = ispCrop;\n-\t\t\tplatformSetIspCrop(ispCrop);\n+\t\t\tplatformSetIspCrop(cropParams.ispIndex, ispCrop);\n \t\t}\n \t}\n }\ndiff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.h b/src/libcamera/pipeline/rpi/common/pipeline_base.h\nindex 9912796ec472..aae0c2f35888 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.h\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.h\n@@ -83,7 +83,7 @@ public:\n \n \tRectangle scaleIspCrop(const Rectangle &ispCrop) const;\n \tvoid applyScalerCrop(const ControlList &controls);\n-\tvirtual void platformSetIspCrop(const Rectangle &ispCrop) = 0;\n+\tvirtual void platformSetIspCrop(unsigned int index, const Rectangle &ispCrop) = 0;\n \n \tvoid cameraTimeout();\n \tvoid frameStarted(uint32_t sequence);\ndiff --git a/src/libcamera/pipeline/rpi/vc4/vc4.cpp b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\nindex cfed214ddbd4..fd8d84b14f15 100644\n--- a/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n+++ b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n@@ -109,7 +109,7 @@ public:\n \tConfig config_;\n \n private:\n-\tvoid platformSetIspCrop(const Rectangle &ispCrop) override\n+\tvoid platformSetIspCrop([[maybe_unused]] unsigned int index, const Rectangle &ispCrop) override\n \t{\n \t\tRectangle crop = ispCrop;\n \t\tisp_[Isp::Input].dev()->setSelection(V4L2_SEL_TGT_CROP, &crop);\n@@ -707,7 +707,7 @@ int Vc4CameraData::platformConfigure(const RPi::RPiCameraConfiguration *rpiConfi\n \tSize size = unicamFormat.size.boundedToAspectRatio(maxSize);\n \tRectangle ispCrop = size.centeredTo(Rectangle(unicamFormat.size).center());\n \n-\tplatformSetIspCrop(ispCrop);\n+\tplatformSetIspCrop(0, ispCrop);\n \t/*\n \t * Set the scaler crop to the value we are using (scaled to native sensor\n \t * coordinates).\n", "prefixes": [ "v3", "6/7" ] }