Patch Detail
Show a patch.
GET /api/1.1/patches/20303/?format=api
{ "id": 20303, "url": "https://patchwork.libcamera.org/api/1.1/patches/20303/?format=api", "web_url": "https://patchwork.libcamera.org/patch/20303/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20240613155949.1041061-3-dan.scally@ideasonboard.com>", "date": "2024-06-13T15:59:44", "name": "[2/7] libcamera: mali-c55: Enable usage of scaler", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "b2fd8efe06bdfb49f37dfc50bcf999c1c04204b0", "submitter": { "id": 156, "url": "https://patchwork.libcamera.org/api/1.1/people/156/?format=api", "name": "Dan Scally", "email": "dan.scally@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/20303/mbox/", "series": [ { "id": 4391, "url": "https://patchwork.libcamera.org/api/1.1/series/4391/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4391", "date": "2024-06-13T15:59:42", "name": "Miscellaneous Mali-C55 Pipeline Fixes", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4391/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/20303/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/20303/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 7C167C3237\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 13 Jun 2024 16:00:08 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A8E1F6548F;\n\tThu, 13 Jun 2024 18:00:04 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B05AF6548D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 13 Jun 2024 17:59:58 +0200 (CEST)", "from mail.ideasonboard.com\n\t(cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net [86.13.91.161])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 775EA675;\n\tThu, 13 Jun 2024 17:59:44 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"G5W39C5W\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1718294384;\n\tbh=ISFpsdSPpVBl+GFGlpwWjAdKRtk8ZIQZ8zbc/wuYZLo=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=G5W39C5WFw4jSczR4UOGudy9Jop3Feb0HfpGzEzKQ6WJcZe81Xyuy+WN78ltaPqtt\n\tUdeyz3nvTRAsOAgbJQZox1krT4uZoaABic5aNJZEOcQdOI9bsVj3WmE2SaQIOGLdFC\n\tnmIrtC8evdXIepvJWOvYf0IVffG7c4VKQzmehrqs=", "From": "Daniel Scally <dan.scally@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Jacopo Mondi <jacopo.mondi@ideasonboard.com>", "Subject": "[PATCH 2/7] libcamera: mali-c55: Enable usage of scaler", "Date": "Thu, 13 Jun 2024 16:59:44 +0100", "Message-Id": "<20240613155949.1041061-3-dan.scally@ideasonboard.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20240613155949.1041061-1-dan.scally@ideasonboard.com>", "References": "<20240613155949.1041061-1-dan.scally@ideasonboard.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": "From: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\n\nThe Mali C55 ISP has a resizing pipeline that allows to crop and scale\nimages.\n\nSo far the mali-c55 pipeline has only supported cropping without using\nthe scaling functionalities.\n\nNow that the kernel has gained support for the scaling operations, make\nthe libcamera pipeline use it by combining it with a first cropping step\nto align the input and output images FOV ratio, and then scale to the\ndesired output size.\n\nSigned-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\n---\n src/libcamera/pipeline/mali-c55/mali-c55.cpp | 18 +++++++++++++++---\n 1 file changed, 15 insertions(+), 3 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/mali-c55/mali-c55.cpp b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\nindex 9442d17c..c4f1afbc 100644\n--- a/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n+++ b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n@@ -715,16 +715,28 @@ int PipelineHandlerMaliC55::configureProcessedStream(MaliC55CameraData *data,\n \tif (ret)\n \t\treturn ret;\n \n-\t/* \\todo Configure the resizer crop/compose rectangles. */\n-\tRectangle ispCrop = { 0, 0, config.size };\n+\t/*\n+\t * Compute the scaler-in to scaler-out ratio: first center-crop to align\n+\t * the FOV to the desired resolution, then scale to the desired size.\n+\t */\n+\tSize scalerIn = subdevFormat.size.boundedToAspectRatio(config.size);\n+\tint xCrop = (subdevFormat.size.width - scalerIn.width) / 2;\n+\tint yCrop = (subdevFormat.size.height - scalerIn.height) / 2;\n+\tRectangle ispCrop = { xCrop, yCrop, scalerIn };\n \tret = pipe->resizer->setSelection(0, V4L2_SEL_TGT_CROP, &ispCrop);\n \tif (ret)\n \t\treturn ret;\n \n-\tret = pipe->resizer->setSelection(0, V4L2_SEL_TGT_COMPOSE, &ispCrop);\n+\tRectangle ispCompose = { 0, 0, config.size };\n+\tret = pipe->resizer->setSelection(0, V4L2_SEL_TGT_COMPOSE, &ispCompose);\n \tif (ret)\n \t\treturn ret;\n \n+\t/*\n+\t * The source pad format size comes directly from the sink\n+\t * compose rectangle.\n+\t */\n+\tsubdevFormat.size = ispCompose.size();\n \tsubdevFormat.code = maliC55FmtToCode.find(config.pixelFormat)->second;\n \treturn pipe->resizer->setFormat(1, &subdevFormat);\n }\n", "prefixes": [ "2/7" ] }