From patchwork Sun Aug 18 01:13:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 1849 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0CCF06193A for ; Sun, 18 Aug 2019 03:13:45 +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 A78AE734 for ; Sun, 18 Aug 2019 03:13:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1566090824; bh=Fcw3hNXCiERtZaj4yAZIDVZ1rC+qk8sK2j7uLQ6xJQc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=P2iWVhb1g+dlirpIEW/AkqKIOZiqDTk6uGdPmU3gzlWJl0xWqr29vQeaNMyInddDF xlWrtYCEy24KHvIysfPzXBz5iY8Kjl9XQ16WER/EzzD0o3YBe6JzbXl63jfbJ95ODI i5y0fTb7cGpHc2CWDUa52VYSnvJ4t8VKCuSKrKAA= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sun, 18 Aug 2019 04:13:27 +0300 Message-Id: <20190818011329.14499-13-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 12/14] android: camera_hal_manager: Clean up resources when terminating 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:46 -0000 The CameraHalManager starts the libcamera CameraManager and creates CameraProxy instances for each camera in the system. Clean up those resources when the CameraHalManager terminates. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- src/android/camera_hal_manager.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp index a1ffb3713d7e..cf981720bca4 100644 --- a/src/android/camera_hal_manager.cpp +++ b/src/android/camera_hal_manager.cpp @@ -90,6 +90,10 @@ void CameraHalManager::run() /* Now start processing events and messages. */ exec(); + + /* Clean up the resources we have allocated. */ + proxies_.clear(); + cameraManager_->stop(); } CameraProxy *CameraHalManager::open(unsigned int id,