[libcamera-devel] [PATCH 5/8] android: CameraDevice: Return const shared_ptr& by camera()

[Hirokazu Honda]

Hi Laurent, thanks for reviewing.

On Tue, Mar 23, 2021 at 11:05 AM Laurent Pinchart
<laurent.pinchart at ideasonboard.com> wrote:
>
> Hi Hiro,
>
> Thank you for the patch.
>
> On Tue, Mar 23, 2021 at 10:42:23AM +0900, Hirokazu Honda wrote:
> > CameraDevice::camera() originally returns shared_ptr. It is
> > mandatory to make a copy by calling camera() in this way. There
> > is no need of copying if a caller needs the reference of the
> > camera like const shared_ptr<Camera> cam = camera(). That is, it
>
> Did you mean '&cam' there ?
>

Yes, sorry for my mistake.

> > is a caller that copying is required. This changes the return
> > type of camera() to const shared_ptr&, so that we are able to
> > reduce one redundant copy in the above case.
> >
> > Signed-off-by: Hirokazu Honda <hiroh at chromium.org>
>
> Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
>
> > ---
> >  src/android/camera_device.h | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/src/android/camera_device.h b/src/android/camera_device.h
> > index 555b33e7..14e26b4d 100644
> > --- a/src/android/camera_device.h
> > +++ b/src/android/camera_device.h
> > @@ -43,7 +43,7 @@ public:
> >
> >       unsigned int id() const { return id_; }
> >       camera3_device_t *camera3Device() { return &camera3Device_; }
> > -     std::shared_ptr<libcamera::Camera> camera() const { return camera_; }
> > +     const std::shared_ptr<libcamera::Camera> &camera() const { return camera_; }
> >       libcamera::CameraConfiguration *cameraConfiguration() const
> >       {
> >               return config_.get();
>
> --
> Regards,
>
> Laurent Pinchart