From patchwork Tue Jan 22 23:29:53 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: 331 Return-Path: Received: from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net [195.74.38.229]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1886B60C7D for ; Wed, 23 Jan 2019 00:30:44 +0100 (CET) X-Halon-ID: ba9f5212-1e9d-11e9-874f-005056917f90 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (unknown [89.233.230.99]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id ba9f5212-1e9d-11e9-874f-005056917f90; Wed, 23 Jan 2019 00:30:40 +0100 (CET) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Wed, 23 Jan 2019 00:29:53 +0100 Message-Id: <20190122232955.31783-2-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190122232955.31783-1-niklas.soderlund@ragnatech.se> References: <20190122232955.31783-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/3] libcamera: camera: create a association with the responsible pipeline handler 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: Tue, 22 Jan 2019 23:30:44 -0000 The PipelineHandler which creates a Camera is responsible for serving any operation requested by the user. In order to do so the Camera needs to store a reference to its creator. Signed-off-by: Niklas Söderlund --- include/libcamera/camera.h | 8 ++++++-- src/libcamera/camera.cpp | 15 +++++++++------ src/libcamera/pipeline/ipu3/ipu3.cpp | 3 ++- src/libcamera/pipeline/uvcvideo.cpp | 2 +- src/libcamera/pipeline/vimc.cpp | 10 ++-------- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h index 2ea1a6883311cf9f..d3bae4cbee1e0cea 100644 --- a/include/libcamera/camera.h +++ b/include/libcamera/camera.h @@ -12,10 +12,13 @@ namespace libcamera { +class PipelineHandler; + class Camera final { public: - static std::shared_ptr create(const std::string &name); + static std::shared_ptr create(const std::string &name, + class PipelineHandler *pipe); Camera(const Camera &) = delete; void operator=(const Camera &) = delete; @@ -23,10 +26,11 @@ public: const std::string &name() const; private: - explicit Camera(const std::string &name); + explicit Camera(const std::string &name, class PipelineHandler *pipe); ~Camera(); std::string name_; + class PipelineHandler *pipe_; }; } /* namespace libcamera */ diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index acf912bee95cbec4..f198eb4978b12239 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -52,17 +52,20 @@ namespace libcamera { /** * \brief Create a camera instance * \param[in] name The name of the camera device + * \param[in] pipe The pipeline handler responsible for the camera device * * The caller is responsible for guaranteeing unicity of the camera name. * * \return A shared pointer to the newly created camera object */ -std::shared_ptr Camera::create(const std::string &name) +std::shared_ptr Camera::create(const std::string &name, + class PipelineHandler *pipe) { struct Allocator : std::allocator { - void construct(void *p, const std::string &name) + void construct(void *p, const std::string &name, + class PipelineHandler *pipe) { - ::new(p) Camera(name); + ::new(p) Camera(name, pipe); } void destroy(Camera *p) { @@ -70,7 +73,7 @@ std::shared_ptr Camera::create(const std::string &name) } }; - return std::allocate_shared(Allocator(), name); + return std::allocate_shared(Allocator(), name, pipe); } /** @@ -83,8 +86,8 @@ const std::string &Camera::name() const return name_; } -Camera::Camera(const std::string &name) - : name_(name) +Camera::Camera(const std::string &name, class PipelineHandler *pipe) + : name_(name), pipe_(pipe) { } diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 8cbc10acfbb571fd..48d028f7e6cd9b4d 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -171,7 +171,8 @@ void PipelineHandlerIPU3::registerCameras(CameraManager *manager) continue; std::string cameraName = sensor->name() + " " + std::to_string(id); - std::shared_ptr camera = Camera::create(cameraName); + std::shared_ptr camera = Camera::create(cameraName, + this); manager->addCamera(std::move(camera)); LOG(IPU3, Info) diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp index 3ba69da8b77586e3..3651250b683e7810 100644 --- a/src/libcamera/pipeline/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo.cpp @@ -48,7 +48,7 @@ bool PipelineHandlerUVC::match(CameraManager *manager, DeviceEnumerator *enumera dev_->acquire(); - std::shared_ptr camera = Camera::create(dev_->model()); + std::shared_ptr camera = Camera::create(dev_->model(), this); manager->addCamera(std::move(camera)); return true; diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp index 82b9237a3d7d93e5..81d8319eb88e06d2 100644 --- a/src/libcamera/pipeline/vimc.cpp +++ b/src/libcamera/pipeline/vimc.cpp @@ -57,14 +57,8 @@ bool PipeHandlerVimc::match(CameraManager *manager, DeviceEnumerator *enumerator dev_->acquire(); - /* - * NOTE: A more complete Camera implementation could - * be passed the MediaDevice(s) it controls here or - * a reference to the PipelineHandler. Which method - * will be chosen depends on how the Camera - * object is modeled. - */ - std::shared_ptr camera = Camera::create("Dummy VIMC Camera"); + std::shared_ptr camera = Camera::create("Dummy VIMC Camera", + this); manager->addCamera(std::move(camera)); return true;