[libcamera-devel] [PATCH 16/20] libcamera: ipu3: Remove camera_ from IPU3CameraConfiguration
Laurent Pinchart
laurent.pinchart at ideasonboard.com
Tue Jul 14 23:43:30 CEST 2020
Hi Jacopo,
Thank you for the patch.
On Tue, Jul 14, 2020 at 12:42:08PM +0200, Jacopo Mondi wrote:
> The IPU3CameraConfiguration::camera_ shared pointer is not used.
> Remove it.
>
> Reviewed-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>
> Signed-off-by: Jacopo Mondi <jacopo at jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> ---
> src/libcamera/pipeline/ipu3/ipu3.cpp | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
> index 2d8b3c501294..804d68d47c92 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;
> }
>
> @@ -296,7 +293,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;
--
Regards,
Laurent Pinchart
More information about the libcamera-devel
mailing list