From patchwork Sun Aug 18 01:13:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 1846 X-Patchwork-Delegate: laurent.pinchart@ideasonboard.com Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0D06C61927 for ; Sun, 18 Aug 2019 03:13:44 +0200 (CEST) Received: from pendragon.bb.dnainternet.fi (dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 8745651C for ; Sun, 18 Aug 2019 03:13:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1566090823; bh=9kg8EUxK5zBDKVa8ZhVkZ7QFPLtbsSMOGu7jdf198lU=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Fz2AdRFnufT3++GY4iBp4HV5+n9dXQOa8ktORofKQlFAQ8Wu2m2cA6OOCqYGuJ0rV PDOC7r5nJVoD92FxxJlklNw+BKVGaWJ8xmUeF6+dOjJntPufQ8UEzUuVGDmkiM6PTS VpPCPhGEqWKJBLAwwgr7OabohAvVkkNEWdLQfmGE= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sun, 18 Aug 2019 04:13:24 +0300 Message-Id: <20190818011329.14499-10-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190818011329.14499-1-laurent.pinchart@ideasonboard.com> References: <20190818011329.14499-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 09/14] android: Pass Camera shared pointer to CameraDevice by const reference X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Aug 2019 01:13:44 -0000 The CameraDevice is constructed with a Camera instance passed through a shared pointer. It makes an internal copy of the pointer, which can be passed by const reference instead of value. This optimises the constructor slightly. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- src/android/camera_device.cpp | 2 +- src/android/camera_device.h | 2 +- src/android/camera_proxy.cpp | 2 +- src/android/camera_proxy.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 999c51e6ba4a..9acfed694abc 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -49,7 +49,7 @@ CameraDevice::Camera3RequestDescriptor::~Camera3RequestDescriptor() * to the framework using the designated callbacks. */ -CameraDevice::CameraDevice(unsigned int id, std::shared_ptr &camera) +CameraDevice::CameraDevice(unsigned int id, const std::shared_ptr &camera) : running_(false), camera_(camera), staticMetadata_(nullptr), requestTemplate_(nullptr) { diff --git a/src/android/camera_device.h b/src/android/camera_device.h index 4d834ceb08a5..7897ba9dc5c7 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -31,7 +31,7 @@ class ThreadRpc; class CameraDevice : public libcamera::Object { public: - CameraDevice(unsigned int id, std::shared_ptr &camera); + CameraDevice(unsigned int id, const std::shared_ptr &camera); ~CameraDevice(); void call(ThreadRpc *rpc); diff --git a/src/android/camera_proxy.cpp b/src/android/camera_proxy.cpp index 3eb2f9fbcffb..4f5c0a024903 100644 --- a/src/android/camera_proxy.cpp +++ b/src/android/camera_proxy.cpp @@ -113,7 +113,7 @@ static camera3_device_ops hal_dev_ops = { .reserved = { nullptr }, }; -CameraProxy::CameraProxy(unsigned int id, std::shared_ptr camera) +CameraProxy::CameraProxy(unsigned int id, const std::shared_ptr &camera) : id_(id) { cameraDevice_ = new CameraDevice(id, camera); diff --git a/src/android/camera_proxy.h b/src/android/camera_proxy.h index da63bfa79fc9..7940eac4e376 100644 --- a/src/android/camera_proxy.h +++ b/src/android/camera_proxy.h @@ -19,7 +19,7 @@ class ThreadRpc; class CameraProxy { public: - CameraProxy(unsigned int id, std::shared_ptr camera); + CameraProxy(unsigned int id, const std::shared_ptr &camera); ~CameraProxy(); int open(const hw_module_t *hardwareModule);