From patchwork Wed Aug 28 01:17:01 2019 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: 1869 Return-Path: Received: from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net [195.74.38.227]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 44D5D60C42 for ; Wed, 28 Aug 2019 03:17:41 +0200 (CEST) X-Halon-ID: 979ada08-c931-11e9-bdc3-005056917a89 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (unknown [95.195.154.80]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA id 979ada08-c931-11e9-bdc3-005056917a89; Wed, 28 Aug 2019 03:17:25 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Wed, 28 Aug 2019 03:17:01 +0200 Message-Id: <20190828011710.32128-5-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20190828011710.32128-1-niklas.soderlund@ragnatech.se> References: <20190828011710.32128-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 04/13] libcamera: pipeline: Add initialization hook for CameraData X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Aug 2019 01:17:41 -0000 Add a hook so CameraData can be initialized before a camera is exposed to an application but after all resources and possibly an IPA have been found. Signed-off-by: Niklas Söderlund --- src/libcamera/include/pipeline_handler.h | 2 ++ src/libcamera/pipeline_handler.cpp | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h index 91d40ef40a465c4e..45f9457879c64363 100644 --- a/src/libcamera/include/pipeline_handler.h +++ b/src/libcamera/include/pipeline_handler.h @@ -43,6 +43,8 @@ public: } virtual ~CameraData() {} + virtual int initCameraData() { return 0; }; + Camera *camera_; PipelineHandler *pipe_; std::list queuedRequests_; diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp index 766fd496306ece9c..6b3ee0ed8f39676a 100644 --- a/src/libcamera/pipeline_handler.cpp +++ b/src/libcamera/pipeline_handler.cpp @@ -66,6 +66,12 @@ LOG_DEFINE_CATEGORY(Pipeline) * is needed for the camera both parameters should be set to 0. */ +/** + * \fn CameraData::initCameraData() + * \brief Hook to initialize the camera data + * \return 0 on success or a negative error code otherwise + */ + /** * \var CameraData::camera_ * \brief The camera related to this CameraData instance @@ -462,6 +468,12 @@ void PipelineHandler::registerCamera(std::shared_ptr camera, } data->camera_ = camera.get(); + if (data->initCameraData()) { + LOG(Pipeline, Warning) << "Skipping " << camera->name() + << " initialization camera data failed"; + return; + } + cameraData_[camera.get()] = std::move(data); cameras_.push_back(camera); manager_->addCamera(std::move(camera));