Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-17 17:35:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcamera: pipeline_handler: Remove Camera pointer from CameraData

Browse source 
There are no users left of this field, drop it.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Niklas Söderlund 2020-12-15 16:41:11 +01:00
parent 8992b3ffbb
commit 6ef7eddfd4
2 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/libcamera/internal/pipeline_handler.h
View file

@ -42,7 +42,6 @@ public:
} }
virtual ~CameraData() = default; virtual ~CameraData() = default;
Camera *camera_;
PipelineHandler *pipe_; PipelineHandler *pipe_;
std::list<Request *> queuedRequests_; std::list<Request *> queuedRequests_;
ControlInfoMap controlInfo_; ControlInfoMap controlInfo_;

11
src/libcamera/pipeline_handler.cpp
View file

@ -60,16 +60,6 @@ LOG_DEFINE_CATEGORY(Pipeline)
* exists. * 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_ * \var CameraData::pipe_
* \brief The pipeline handler related to this CameraData instance * \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> camera, void PipelineHandler::registerCamera(std::shared_ptr<Camera> camera,
std::unique_ptr<CameraData> data) std::unique_ptr<CameraData> data)
{ {
data->camera_ = camera.get();
cameraData_[camera.get()] = std::move(data); cameraData_[camera.get()] = std::move(data);
cameras_.push_back(camera); cameras_.push_back(camera);