{"id":8537,"url":"https://patchwork.libcamera.org/api/patches/8537/?format=json","web_url":"https://patchwork.libcamera.org/patch/8537/","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":"<20200701123036.51922-11-jacopo@jmondi.org>","date":"2020-07-01T12:30:31","name":"[libcamera-devel,10/15] libcamera: ipu3: Remove camera_ from IPU3CameraConfiguration","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"59a33819908cdb5716d0588bc520c2c783444d9f","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/8537/mbox/","series":[{"id":1066,"url":"https://patchwork.libcamera.org/api/series/1066/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1066","date":"2020-07-01T12:30:21","name":"libcamera: ipu3: Rework streams configuration","version":1,"mbox":"https://patchwork.libcamera.org/series/1066/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8537/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8537/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 175DFC2E6C\n\tfor ;\n\tWed, 1 Jul 2020 12:27:27 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E413E60CC2;\n\tWed, 1 Jul 2020 14:27:26 +0200 (CEST)","from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 00BC160CBE\n\tfor ;\n\tWed, 1 Jul 2020 14:27:25 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 9B0C81C0003;\n\tWed, 1 Jul 2020 12:27:24 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 1 Jul 2020 14:30:31 +0200","Message-Id":"<20200701123036.51922-11-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200701123036.51922-1-jacopo@jmondi.org>","References":"<20200701123036.51922-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 10/15] 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=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The IPU3CameraConfiguration::camera_ shared pointer is not used.\nRemove it.\n\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 4d70f9e3a30c..16bda97a3cc3 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -59,19 +59,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 \tconst IPU3CameraData *data_;\n \n \tStreamConfiguration cio2Configuration_;\n@@ -121,11 +115,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@@ -234,7 +226,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 \tCIO2Device *cio2 = &data->cio2_;\n \n \tif (roles.empty())\n","prefixes":["libcamera-devel","10/15"]}