From patchwork Mon Dec 21 23:53:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 10692 X-Patchwork-Delegate: niklas.soderlund@ragnatech.se Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id C6686C0F1A for ; Mon, 21 Dec 2020 23:54:06 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0EBE1615B2; Tue, 22 Dec 2020 00:54:06 +0100 (CET) Received: from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net [195.74.38.227]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3F1E96159A for ; Tue, 22 Dec 2020 00:54:04 +0100 (CET) X-Halon-ID: cdb5bb41-43e7-11eb-a076-005056917f90 Authorized-sender: niklas.soderlund@fsdn.se Received: from wyvern.dyn.berto.se (h-209-203.a463.priv.bahnhof.se [155.4.209.203]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id cdb5bb41-43e7-11eb-a076-005056917f90; Tue, 22 Dec 2020 00:54:03 +0100 (CET) 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: Remove Camera pointer from CameraData X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" There are no users left of this field, drop it. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- include/libcamera/internal/pipeline_handler.h | 1 - src/libcamera/pipeline_handler.cpp | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h index 5f9a26be1f7a9e9e..0748f86346084e2d 100644 --- a/include/libcamera/internal/pipeline_handler.h +++ b/include/libcamera/internal/pipeline_handler.h @@ -42,7 +42,6 @@ public: } virtual ~CameraData() = default; - Camera *camera_; PipelineHandler *pipe_; std::list queuedRequests_; ControlInfoMap controlInfo_; diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp index 26d6c07d2d6e69e9..c2604d4561124186 100644 --- a/src/libcamera/pipeline_handler.cpp +++ b/src/libcamera/pipeline_handler.cpp @@ -60,16 +60,6 @@ LOG_DEFINE_CATEGORY(Pipeline) * exists. */ -/** - * \var CameraData::camera_ - * \brief The camera related to this CameraData instance - * - * The camera_ pointer provides access to the Camera object that this instance - * is related to. It is set when the Camera is registered with - * PipelineHandler::registerCamera() and remains valid until the CameraData - * instance is destroyed. - */ - /** * \var CameraData::pipe_ * \brief The pipeline handler related to this CameraData instance @@ -493,7 +483,6 @@ void PipelineHandler::completeRequest(Request *request) void PipelineHandler::registerCamera(std::shared_ptr camera, std::unique_ptr data) { - data->camera_ = camera.get(); cameraData_[camera.get()] = std::move(data); cameras_.push_back(camera);