{"id":19664,"url":"https://patchwork.libcamera.org/api/1.1/patches/19664/?format=json","web_url":"https://patchwork.libcamera.org/patch/19664/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20240311141524.27192-2-hdegoede@redhat.com>","date":"2024-03-11T14:15:05","name":"[v5,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/1.1/people/102/?format=json","name":"Hans de Goede","email":"hdegoede@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19664/mbox/","series":[{"id":4214,"url":"https://patchwork.libcamera.org/api/1.1/series/4214/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4214","date":"2024-03-11T14:15:04","name":"libcamera: introduce Software ISP and Software IPA","version":5,"mbox":"https://patchwork.libcamera.org/series/4214/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19664/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19664/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 D9818C32A3\n\tfor ;\n\tMon, 11 Mar 2024 14:15:34 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7EDBF62C8B;\n\tMon, 11 Mar 2024 15:15:34 +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 7765762C84\n\tfor ;\n\tMon, 11 Mar 2024 15:15:33 +0100 (CET)","from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com\n\t[66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS\n\t(version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n\tus-mta-125-I3QbQag9OMqkjiqRlFn55A-1; Mon, 11 Mar 2024 10:15:28 -0400","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 58D4E800264;\n\tMon, 11 Mar 2024 14:15:28 +0000 (UTC)","from x1.localdomain.com (unknown [10.39.195.37])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 1687C1C060D4;\n\tMon, 11 Mar 2024 14:15:26 +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=\"VmkgDRFA\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1710166532;\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=sSPpSwXf62jKoxNPFcYs7B7zzBOl8EEz7y+Qmi+EbFo=;\n\tb=VmkgDRFAao7iIPC7GSpTbMbxm/gWgqDsKcdGVv1hR+3ufiufcVB1rS44zX1eDGp0Pi4w/r\n\tCdP7bJUR3w6SFaJRB0VIZgzW9eeNtfytNdoA7eAexQMUfiwwGS0SKHW4U5Z0wwLaRNNYOv\n\t0kxEgzdCt73SzU4u4+JaUkTyQakneWs=","X-MC-Unique":"I3QbQag9OMqkjiqRlFn55A-1","From":"Hans de Goede ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH v5 01/18] libcamera: pipeline: simple: fix size adjustment in\n\tvalidate()","Date":"Mon, 11 Mar 2024 15:15:05 +0100","Message-ID":"<20240311141524.27192-2-hdegoede@redhat.com>","In-Reply-To":"<20240311141524.27192-1-hdegoede@redhat.com>","References":"<20240311141524.27192-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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Maxime Ripard , Pavel Machek ,\n\tBryan O'Donoghue ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Andrey Konovalov \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 # sc8280xp Lenovo x13s\nTested-by: Pavel Machek \nReviewed-by: Milan Zamazal \nReviewed-by: Pavel Machek \nSigned-off-by: Andrey Konovalov \nSigned-off-by: Hans de Goede \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":["v5","01/18"]}