{"id":8704,"url":"https://patchwork.libcamera.org/api/1.1/patches/8704/?format=json","web_url":"https://patchwork.libcamera.org/patch/8704/","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-14-jacopo@jmondi.org>","date":"2020-07-09T08:41:21","name":"[libcamera-devel,v2,13/20] libcamera: ipu3: Store CameraData as mutable in CameraConfiguration","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"87a4f9cfa143d302ce2dbfb6791a660016a6d311","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/1.1/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/8704/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/8704/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8704/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 740BBBD790\n\tfor ;\n\tThu, 9 Jul 2020 08:38:18 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3AC04611AE;\n\tThu, 9 Jul 2020 10:38:18 +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 6165561158\n\tfor ;\n\tThu, 9 Jul 2020 10:38:16 +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 ADE34100004;\n\tThu, 9 Jul 2020 08:38:15 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 9 Jul 2020 10:41:21 +0200","Message-Id":"<20200709084128.5316-14-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 13/20] libcamera: ipu3: Store\n\tCameraData as mutable in CameraConfiguration","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=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"A reference to the CameraData sub-class is stored in the\nIPU3CameraConfiguration as a const pointer, as the now removed comment\nreports \"to allow the compiler catch un-wanted modifications during\nvalidate()\".\n\nAs the CameraData contains pointers to the available streams, which are\nactually assigned during validate, the comment and the rationale behind\nthat choice seems now moot.\n\nStore CameraData as a mutable pointer and remove the comment and the\nconst_cast<> required to assign streams.\n\nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 16 ++++------------\n 1 file changed, 4 insertions(+), 12 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex feabffe641e1..9fed6c1e5aa7 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -75,7 +75,7 @@ private:\n \t * reference to the camera data, store a new reference to the camera.\n \t */\n \tstd::shared_ptr camera_;\n-\tconst IPU3CameraData *data_;\n+\tIPU3CameraData *data_;\n \n \tStreamConfiguration cio2Configuration_;\n \tstd::vector streams_;\n@@ -207,7 +207,7 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \t\t\tcfg.size = cio2Configuration_.size;\n \t\t\tcfg.pixelFormat = cio2Configuration_.pixelFormat;\n \t\t\tcfg.bufferCount = cio2Configuration_.bufferCount;\n-\t\t\tcfg.setStream(const_cast(&data_->rawStream_));\n+\t\t\tcfg.setStream(&data_->rawStream_);\n \n \t\t\tLOG(IPU3, Debug) << \"Assigned \" << cfg.toString()\n \t\t\t\t\t << \" to the raw stream\";\n@@ -256,27 +256,19 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \t\tcfg.bufferCount = IPU3_BUFFER_COUNT;\n \t\tcfg.pixelFormat = formats::NV12;\n \n-\t\t/*\n-\t\t * Use a const_cast<> here instead of storing a mutable stream\n-\t\t * pointer in the configuration to let the compiler catch\n-\t\t * unwanted modifications of camera data in the configuration\n-\t\t * validate() implementation.\n-\t\t */\n-\t\tStream *stream;\n \t\tif (mainOutputAvailable &&\n \t\t (oldCfg.size == yuvSize || outCount == 1)) {\n-\t\t\tstream = const_cast(&data_->outStream_);\n+\t\t\tcfg.setStream(&data_->outStream_);\n \t\t\tmainOutputAvailable = false;\n \n \t\t\tLOG(IPU3, Debug) << \"Assigned \" << cfg.toString()\n \t\t\t\t\t << \" to the main output\";\n \t\t} else {\n-\t\t\tstream = const_cast(&data_->vfStream_);\n+\t\t\tcfg.setStream(&data_->vfStream_);\n \n \t\t\tLOG(IPU3, Debug) << \"Assigned \" << cfg.toString()\n \t\t\t\t\t << \" to the viewfinder output\";\n \t\t}\n-\t\tcfg.setStream(stream);\n \n \t\tif (cfg.pixelFormat != oldCfg.pixelFormat ||\n \t\t cfg.size != oldCfg.size) {\n","prefixes":["libcamera-devel","v2","13/20"]}