From patchwork Fri Sep 10 07:06:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 13807 X-Patchwork-Delegate: umang.jain@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id B4B89BDC71 for ; Fri, 10 Sep 2021 07:07:06 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 811536917E; Fri, 10 Sep 2021 09:07:06 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="WoVkS3ZQ"; dkim-atps=neutral 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 7D1A269173 for ; Fri, 10 Sep 2021 09:07:04 +0200 (CEST) Received: from perceval.ideasonboard.com (unknown [103.251.226.149]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 67C21BC0; Fri, 10 Sep 2021 09:07:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1631257624; bh=F2quetUbPCNcaM/qIjB8+u9Jj2pS/LI0AsvgPyb0TXM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WoVkS3ZQXDvSMKnWMgTyMZi8AFT9IU4IJv55HU8ZVhlsJtF9AFGC/LRr/pRjMTSJA MK3OFZhPf7BuxAO48Xilv8ZVPZGU7RrO9Y3io2tRTSDO6Zyb/NfhVihXhORDFQGN4x N1CJEeV8oyCKZkyfX25gl9RoshNeyRgI67r32n0M= From: Umang Jain To: libcamera-devel@lists.libcamera.org Date: Fri, 10 Sep 2021 12:36:38 +0530 Message-Id: <20210910070638.467294-10-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210910070638.467294-1-umang.jain@ideasonboard.com> References: <20210910070638.467294-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 9/9] RFC: Stop PostProcessor when camera is stopped X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Stopping the post-processor thread from CameraDevice is not ideal. But it temporarily avoids the crash on stopping the camera. Signed-off-by: Umang Jain --- src/android/camera_device.cpp | 8 ++++++++ src/android/camera_stream.h | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 73eb5758..fa2db72f 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -425,6 +425,14 @@ int CameraDevice::open(const hw_module_t *hardwareModule) void CameraDevice::close() { + for (CameraStream &cameraStream : streams_) { + /* CameraStream doesn't have user defined destructor as + * it is MoveConstructible. Stop the post-processor thread + * from here before clearing streams_. + */ + cameraStream.stopPostProcessorThread(); + } + streams_.clear(); stop(); diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h index dbb7eee3..bd37473e 100644 --- a/src/android/camera_stream.h +++ b/src/android/camera_stream.h @@ -133,6 +133,13 @@ public: const Camera3RequestDescriptor *context); libcamera::FrameBuffer *getBuffer(); void putBuffer(libcamera::FrameBuffer *buffer); + void stopPostProcessorThread() + { + if (thread_) { + thread_->exit(); + thread_->wait(); + } + } enum ProcessStatus { Succeeded,