{"id":10692,"url":"https://patchwork.libcamera.org/api/1.1/patches/10692/?format=json","web_url":"https://patchwork.libcamera.org/patch/10692/","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":"<20201221235345.1965878-3-niklas.soderlund@ragnatech.se>","date":"2020-12-21T23:53:45","name":"[libcamera-devel,v2,2/2] libcamera: pipeline_handler: Remove Camera pointer from CameraData","commit_ref":"6ef7eddfd4833095d5ad93e523c414fab66aff90","pull_url":null,"state":"accepted","archived":false,"hash":"c2852eca84a61fc52c4b1727082f19942ef39714","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/1.1/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":{"id":16,"url":"https://patchwork.libcamera.org/api/1.1/users/16/?format=json","username":"neg","first_name":"Niklas","last_name":"Söderlund","email":"niklas.soderlund@ragnatech.se"},"mbox":"https://patchwork.libcamera.org/patch/10692/mbox/","series":[{"id":1539,"url":"https://patchwork.libcamera.org/api/1.1/series/1539/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1539","date":"2020-12-21T23:53:43","name":"libcamera: pipeline_handler: Remove Camera pointer from Request handling","version":2,"mbox":"https://patchwork.libcamera.org/series/1539/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10692/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10692/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 C6686C0F1A\n\tfor ;\n\tMon, 21 Dec 2020 23:54:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0EBE1615B2;\n\tTue, 22 Dec 2020 00:54:06 +0100 (CET)","from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3F1E96159A\n\tfor ;\n\tTue, 22 Dec 2020 00:54:04 +0100 (CET)","from wyvern.dyn.berto.se (h-209-203.a463.priv.bahnhof.se\n\t[155.4.209.203]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid cdb5bb41-43e7-11eb-a076-005056917f90;\n\tTue, 22 Dec 2020 00:54:03 +0100 (CET)"],"X-Halon-ID":"cdb5bb41-43e7-11eb-a076-005056917f90","Authorized-sender":"niklas.soderlund@fsdn.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 22 Dec 2020 00:53:45 +0100","Message-Id":"<20201221235345.1965878-3-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.29.2","In-Reply-To":"<20201221235345.1965878-1-niklas.soderlund@ragnatech.se>","References":"<20201221235345.1965878-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 2/2] libcamera: pipeline_handler:\n\tRemove Camera pointer from CameraData","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":"There are no users left of this field, drop it.\n\nSigned-off-by: Niklas Söderlund \n---\n include/libcamera/internal/pipeline_handler.h | 1 -\n src/libcamera/pipeline_handler.cpp | 11 -----------\n 2 files changed, 12 deletions(-)","diff":"diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\nindex 5f9a26be1f7a9e9e..0748f86346084e2d 100644\n--- a/include/libcamera/internal/pipeline_handler.h\n+++ b/include/libcamera/internal/pipeline_handler.h\n@@ -42,7 +42,6 @@ public:\n \t}\n \tvirtual ~CameraData() = default;\n \n-\tCamera *camera_;\n \tPipelineHandler *pipe_;\n \tstd::list queuedRequests_;\n \tControlInfoMap controlInfo_;\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex 26d6c07d2d6e69e9..c2604d4561124186 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -60,16 +60,6 @@ LOG_DEFINE_CATEGORY(Pipeline)\n * exists.\n */\n \n-/**\n- * \\var CameraData::camera_\n- * \\brief The camera related to this CameraData instance\n- *\n- * The camera_ pointer provides access to the Camera object that this instance\n- * is related to. It is set when the Camera is registered with\n- * PipelineHandler::registerCamera() and remains valid until the CameraData\n- * instance is destroyed.\n- */\n-\n /**\n * \\var CameraData::pipe_\n * \\brief The pipeline handler related to this CameraData instance\n@@ -493,7 +483,6 @@ void PipelineHandler::completeRequest(Request *request)\n void PipelineHandler::registerCamera(std::shared_ptr camera,\n \t\t\t\t std::unique_ptr data)\n {\n-\tdata->camera_ = camera.get();\n \tcameraData_[camera.get()] = std::move(data);\n \tcameras_.push_back(camera);\n \n","prefixes":["libcamera-devel","v2","2/2"]}