summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacopo Mondi <jacopo@jmondi.org>2020-06-30 17:35:58 +0200
committerJacopo Mondi <jacopo@jmondi.org>2020-08-03 11:16:17 +0200
commitd6a9ff0239c7d22f9690080b64e33ee2c047457a (patch)
tree53d0ffd405d8584db0e4ab6c9eedeeea872a38e2
parented9fcf29e7d836fa1bd0b44931bfbe6369654a83 (diff)
libcamera: ipu3: Remove camera_ from IPU3CameraConfiguration
The IPU3CameraConfiguration::camera_ shared pointer is not used. Remove it. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
-rw-r--r--src/libcamera/pipeline/ipu3/ipu3.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
index e90d0910..a081a81c 100644
--- a/src/libcamera/pipeline/ipu3/ipu3.cpp
+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
@@ -62,7 +62,7 @@ public:
class IPU3CameraConfiguration : public CameraConfiguration
{
public:
- IPU3CameraConfiguration(Camera *camera, IPU3CameraData *data);
+ IPU3CameraConfiguration(IPU3CameraData *data);
Status validate() override;
@@ -74,7 +74,6 @@ private:
* corresponding Camera instance is valid. In order to borrow a
* reference to the camera data, store a new reference to the camera.
*/
- std::shared_ptr<Camera> camera_;
const IPU3CameraData *data_;
StreamConfiguration cio2Configuration_;
@@ -124,11 +123,9 @@ private:
MediaDevice *imguMediaDev_;
};
-IPU3CameraConfiguration::IPU3CameraConfiguration(Camera *camera,
- IPU3CameraData *data)
+IPU3CameraConfiguration::IPU3CameraConfiguration(IPU3CameraData *data)
: CameraConfiguration()
{
- camera_ = camera->shared_from_this();
data_ = data;
}
@@ -297,7 +294,7 @@ CameraConfiguration *PipelineHandlerIPU3::generateConfiguration(Camera *camera,
const StreamRoles &roles)
{
IPU3CameraData *data = cameraData(camera);
- IPU3CameraConfiguration *config = new IPU3CameraConfiguration(camera, data);
+ IPU3CameraConfiguration *config = new IPU3CameraConfiguration(data);
if (roles.empty())
return config;