Patch Detail
Show a patch.
GET /api/patches/19572/?format=api
{ "id": 19572, "url": "https://patchwork.libcamera.org/api/patches/19572/?format=api", "web_url": "https://patchwork.libcamera.org/patch/19572/", "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": "<20240229183654.7206-2-hdegoede@redhat.com>", "date": "2024-02-29T18:36:12", "name": "[v4,01/18] libcamera: pipeline: simple: fix size adjustment in validate()", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "a22834485cc879ea7c7d0f44c2876e091b231f0d", "submitter": { "id": 102, "url": "https://patchwork.libcamera.org/api/people/102/?format=api", "name": "Hans de Goede", "email": "hdegoede@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/19572/mbox/", "series": [ { "id": 4195, "url": "https://patchwork.libcamera.org/api/series/4195/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4195", "date": "2024-02-29T18:36:11", "name": "libcamera: introduce Software ISP and Software IPA", "version": 4, "mbox": "https://patchwork.libcamera.org/series/4195/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/19572/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/19572/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 1A051BD160\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 29 Feb 2024 18:37:05 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DA8C262868;\n\tThu, 29 Feb 2024 19:37:04 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AFD0D62867\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 29 Feb 2024 19:37:03 +0100 (CET)", "from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-215-6XqhDAykOo-xQkHcLR3H3Q-1;\n\tThu, 29 Feb 2024 13:36:58 -0500", "from smtp.corp.redhat.com\n\t(int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mimecast-mx02.redhat.com (Postfix) with ESMTPS id C063929AA3B4;\n\tThu, 29 Feb 2024 18:36:57 +0000 (UTC)", "from shalem.redhat.com (unknown [10.39.192.10])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id ABA801C060B1;\n\tThu, 29 Feb 2024 18:36:56 +0000 (UTC)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"FHjfFGAK\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1709231822;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=rXFxaDFzAvk1gQ0trIvCVHe0LKfhxrZKoTdAlTgIiSc=;\n\tb=FHjfFGAKB5C3Jr8qtmn2l5rXYZkaQ2Dq3ih8UK/rSSbf8pMCdHN0kcu866yzV1SeR07Zuj\n\t/Pzlm+w0GDSBSlX2cZ4+XCUnWxmBhxn9knh0vZEeNi4Az/lSfMGwIqpFnuKYY6rDn5RPcx\n\txMkoLDsbn2em3lEYNmekJKjjhWI6tM0=", "X-MC-Unique": "6XqhDAykOo-xQkHcLR3H3Q-1", "From": "Hans de Goede <hdegoede@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Subject": "[PATCH v4 01/18] libcamera: pipeline: simple: fix size adjustment in\n\tvalidate()", "Date": "Thu, 29 Feb 2024 19:36:12 +0100", "Message-ID": "<20240229183654.7206-2-hdegoede@redhat.com>", "In-Reply-To": "<20240229183654.7206-1-hdegoede@redhat.com>", "References": "<20240229183654.7206-1-hdegoede@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.11.54.7", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"; x-default=true", "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>", "Cc": "Maxime Ripard <mripard@redhat.com>, Pavel Machek <pavel@ucw.cz>,\n\tBryan O'Donoghue <bryan.odonoghue@linaro.org>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "From: Andrey Konovalov <andrey.konovalov@linaro.org>\n\nSimpleCameraConfiguration::validate() adjusts the configuration of its\nstreams (if the size is not in the outputSizes) to the captureSize. But\nthe captureSize itself can be not in the outputSizes, and then the\nadjusted configuration won't be valid resulting in camera configuration\nfailure.\n\nTested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> # sc8280xp Lenovo x13s\nTested-by: Pavel Machek <pavel@ucw.cz>\nReviewed-by: Milan Zamazal <mzamazal@redhat.com>\nReviewed-by: Pavel Machek <pavel@ucw.cz>\nSigned-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>\nSigned-off-by: Hans de Goede <hdegoede@redhat.com>\n---\n src/libcamera/pipeline/simple/simple.cpp | 37 ++++++++++++++++++++++--\n 1 file changed, 35 insertions(+), 2 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex e37b0d1c..aa69bcc4 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -882,6 +882,30 @@ SimpleCameraConfiguration::SimpleCameraConfiguration(Camera *camera,\n {\n }\n \n+namespace {\n+\n+static Size adjustSize(const Size &requestedSize, const SizeRange &supportedSizes)\n+{\n+\tASSERT(supportedSizes.min <= supportedSizes.max);\n+\n+\tif (supportedSizes.min == supportedSizes.max)\n+\t\treturn supportedSizes.max;\n+\n+\tunsigned int hStep = supportedSizes.hStep;\n+\tunsigned int vStep = supportedSizes.vStep;\n+\n+\tif (hStep == 0)\n+\t\thStep = supportedSizes.max.width - supportedSizes.min.width;\n+\tif (vStep == 0)\n+\t\tvStep = supportedSizes.max.height - supportedSizes.min.height;\n+\n+\tSize adjusted = requestedSize.boundedTo(supportedSizes.max).expandedTo(supportedSizes.min);\n+\n+\treturn adjusted.shrunkBy(supportedSizes.min).alignedDownTo(hStep, vStep).grownBy(supportedSizes.min);\n+}\n+\n+} /* namespace */\n+\n CameraConfiguration::Status SimpleCameraConfiguration::validate()\n {\n \tconst CameraSensor *sensor = data_->sensor_.get();\n@@ -998,10 +1022,19 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()\n \t\t}\n \n \t\tif (!pipeConfig_->outputSizes.contains(cfg.size)) {\n+\t\t\tSize adjustedSize = pipeConfig_->captureSize;\n+\t\t\t/*\n+\t\t\t * The converter (when present) may not be able to output\n+\t\t\t * a size identical to its input size. The capture size is thus\n+\t\t\t * not guaranteed to be a valid output size. In such cases, use\n+\t\t\t * the smaller valid output size closest to the requested.\n+\t\t\t */\n+\t\t\tif (!pipeConfig_->outputSizes.contains(adjustedSize))\n+\t\t\t\tadjustedSize = adjustSize(cfg.size, pipeConfig_->outputSizes);\n \t\t\tLOG(SimplePipeline, Debug)\n \t\t\t\t<< \"Adjusting size from \" << cfg.size\n-\t\t\t\t<< \" to \" << pipeConfig_->captureSize;\n-\t\t\tcfg.size = pipeConfig_->captureSize;\n+\t\t\t\t<< \" to \" << adjustedSize;\n+\t\t\tcfg.size = adjustedSize;\n \t\t\tstatus = Adjusted;\n \t\t}\n \n", "prefixes": [ "v4", "01/18" ] }