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

libcamera: ipu3: Remove camera_ from IPU3CameraConfiguration

Browse source 
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>
This commit is contained in:
Jacopo Mondi 2020-06-30 17:35:58 +02:00
parent ed9fcf29e7
commit d6a9ff0239
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libcamera/pipeline/ipu3/ipu3.cpp
View file

@ -62,7 +62,7 @@ public:
class IPU3CameraConfiguration : public CameraConfiguration class IPU3CameraConfiguration : public CameraConfiguration
{ {
public: public:
IPU3CameraConfiguration(Camera *camera, IPU3CameraData *data); IPU3CameraConfiguration(IPU3CameraData *data);
Status validate() override; Status validate() override;
@ -74,7 +74,6 @@ private:
* corresponding Camera instance is valid. In order to borrow a * corresponding Camera instance is valid. In order to borrow a
* reference to the camera data, store a new reference to the camera. * reference to the camera data, store a new reference to the camera.
*/ */
std::shared_ptr<Camera> camera_;
const IPU3CameraData *data_; const IPU3CameraData *data_;
StreamConfiguration cio2Configuration_; StreamConfiguration cio2Configuration_;
@ -124,11 +123,9 @@ private:
MediaDevice *imguMediaDev_; MediaDevice *imguMediaDev_;
}; };
IPU3CameraConfiguration::IPU3CameraConfiguration(Camera *camera, IPU3CameraConfiguration::IPU3CameraConfiguration(IPU3CameraData *data)
IPU3CameraData *data)
: CameraConfiguration() : CameraConfiguration()
{ {
camera_ = camera->shared_from_this();
data_ = data; data_ = data;
} }
@ -297,7 +294,7 @@ CameraConfiguration *PipelineHandlerIPU3::generateConfiguration(Camera *camera,
const StreamRoles &roles) const StreamRoles &roles)
{ {
IPU3CameraData *data = cameraData(camera); IPU3CameraData *data = cameraData(camera);
IPU3CameraConfiguration *config = new IPU3CameraConfiguration(camera, data); IPU3CameraConfiguration *config = new IPU3CameraConfiguration(data);
if (roles.empty()) if (roles.empty())
return config; return config;