{"id":8706,"url":"https://patchwork.libcamera.org/api/patches/8706/?format=json","web_url":"https://patchwork.libcamera.org/patch/8706/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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-16-jacopo@jmondi.org>","date":"2020-07-09T08:41:23","name":"[libcamera-devel,v2,15/20] libcamera: ipu3: Remove camera_ from IPU3CameraConfiguration","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"7f4184656a2e69b9de78555f098517c70e63c205","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8706/mbox/","series":[{"id":1091,"url":"https://patchwork.libcamera.org/api/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/8706/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8706/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 7AC6FBDB1C\n\tfor ;\n\tThu, 9 Jul 2020 08:38:20 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3AC4361197;\n\tThu, 9 Jul 2020 10:38:20 +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 7954C611AA\n\tfor ;\n\tThu, 9 Jul 2020 10:38:18 +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 93895100002;\n\tThu, 9 Jul 2020 08:38:17 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 9 Jul 2020 10:41:23 +0200","Message-Id":"<20200709084128.5316-16-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 15/20] libcamera: ipu3: Remove camera_\n\tfrom IPU3CameraConfiguration","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 IPU3CameraConfiguration::camera_ shared pointer is not used.\nRemove it.\n\nReviewed-by: Niklas Söderlund \nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 14 +++-----------\n 1 file changed, 3 insertions(+), 11 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 1c6627e561c4..9a6e71514c90 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -61,19 +61,13 @@ public:\n class IPU3CameraConfiguration : public CameraConfiguration\n {\n public:\n-\tIPU3CameraConfiguration(Camera *camera, IPU3CameraData *data);\n+\tIPU3CameraConfiguration(IPU3CameraData *data);\n \n \tStatus validate() override;\n \n \tconst StreamConfiguration &cio2Format() const { return cio2Configuration_; };\n \n private:\n-\t/*\n-\t * The IPU3CameraData instance is guaranteed to be valid as long as the\n-\t * corresponding Camera instance is valid. In order to borrow a\n-\t * reference to the camera data, store a new reference to the camera.\n-\t */\n-\tstd::shared_ptr camera_;\n \tIPU3CameraData *data_;\n \n \tStreamConfiguration cio2Configuration_;\n@@ -123,11 +117,9 @@ private:\n \tMediaDevice *imguMediaDev_;\n };\n \n-IPU3CameraConfiguration::IPU3CameraConfiguration(Camera *camera,\n-\t\t\t\t\t\t IPU3CameraData *data)\n+IPU3CameraConfiguration::IPU3CameraConfiguration(IPU3CameraData *data)\n \t: CameraConfiguration()\n {\n-\tcamera_ = camera->shared_from_this();\n \tdata_ = data;\n }\n \n@@ -289,7 +281,7 @@ CameraConfiguration *PipelineHandlerIPU3::generateConfiguration(Camera *camera,\n \t\t\t\t\t\t\t\tconst StreamRoles &roles)\n {\n \tIPU3CameraData *data = cameraData(camera);\n-\tIPU3CameraConfiguration *config = new IPU3CameraConfiguration(camera, data);\n+\tIPU3CameraConfiguration *config = new IPU3CameraConfiguration(data);\n \n \tif (roles.empty())\n \t\treturn config;\n","prefixes":["libcamera-devel","v2","15/20"]}