{"id":8696,"url":"https://patchwork.libcamera.org/api/1.1/patches/8696/?format=json","web_url":"https://patchwork.libcamera.org/patch/8696/","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":"<20200709084128.5316-6-jacopo@jmondi.org>","date":"2020-07-09T08:41:13","name":"[libcamera-devel,v2,05/20] libcamera: ipu3: Do not overwrite StreamConfiguration","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"8cb050b9751e91c00e018167ab5782f5e0cd7d7b","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8696/mbox/","series":[{"id":1091,"url":"https://patchwork.libcamera.org/api/1.1/series/1091/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1091","date":"2020-07-09T08:41:08","name":"libcamera: ipu3: Rework configuration","version":2,"mbox":"https://patchwork.libcamera.org/series/1091/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8696/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8696/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 6830FBD790\n\tfor ;\n\tThu, 9 Jul 2020 08:38:12 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 454F4611A7;\n\tThu, 9 Jul 2020 10:38:12 +0200 (CEST)","from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CE26D61186\n\tfor ;\n\tThu, 9 Jul 2020 10:38:08 +0200 (CEST)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay11.mail.gandi.net (Postfix) with ESMTPSA id 6EC96100002;\n\tThu, 9 Jul 2020 08:38:07 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 9 Jul 2020 10:41:13 +0200","Message-Id":"<20200709084128.5316-6-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200709084128.5316-1-jacopo@jmondi.org>","References":"<20200709084128.5316-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 05/20] libcamera: ipu3: Do not\n\toverwrite StreamConfiguration","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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The validate function overwrites the generated StreamConfiguration with\nthe one reported by the CIO2 unit when inspecting the RAW stream\nconfiguration.\n\nAs we prepare to add StreamFormats to the IPU3 StreamConfiguration,\nassigning to the CIO2 generated configuration would delete the\nStreamFormats.\n\nFix this by updating relevant fields only in order to keep the\nassigned StreamFormats.\n\nReviewed-by: Niklas Söderlund \nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 4 +++-\n 1 file changed, 3 insertions(+), 1 deletion(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex e62a5d5b3517..978a6e58c72f 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -269,7 +269,9 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \t\tconst Stream *stream = streams_[i];\n \n \t\tif (stream == &data_->rawStream_) {\n-\t\t\tcfg = cio2Configuration_;\n+\t\t\tcfg.size = cio2Configuration_.size;\n+\t\t\tcfg.pixelFormat = cio2Configuration_.pixelFormat;\n+\t\t\tcfg.bufferCount = cio2Configuration_.bufferCount;\n \t\t} else {\n \t\t\tbool scale = stream == &data_->vfStream_;\n \t\t\tadjustStream(config_[i], scale);\n","prefixes":["libcamera-devel","v2","05/20"]}