[{"id":16092,"web_url":"https://patchwork.libcamera.org/comment/16092/","msgid":"","date":"2021-04-02T22:31:04","subject":"Re: [libcamera-devel] [PATCH v5 1/2] android: CameraDevice: Add\n\tstop()","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Hiro,\n\nThank you for the patch.\n\nOn Fri, Apr 02, 2021 at 11:12:37AM +0900, Hirokazu Honda wrote:\n> This adds CameraDevice::stop(), which cleans up the member\n> variables of CameraDevice. It is called in CameraDevice::close()\n> and CameraDevice::configureStreams().\n> \n> Signed-off-by: Hirokazu Honda \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/android/camera_device.cpp | 19 ++++++++++++-------\n> src/android/camera_device.h | 2 ++\n> 2 files changed, 14 insertions(+), 7 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index eb327978..b45d3a54 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -659,9 +659,18 @@ void CameraDevice::close()\n> {\n> \tstreams_.clear();\n> \n> +\tstop();\n> +\n> +\tcamera_->release();\n> +}\n> +\n> +void CameraDevice::stop()\n> +{\n> +\tif (!running_)\n> +\t\treturn;\n> +\n> \tworker_.stop();\n> \tcamera_->stop();\n> -\tcamera_->release();\n> \n> \trunning_ = false;\n> }\n> @@ -1547,12 +1556,8 @@ PixelFormat CameraDevice::toPixelFormat(int format) const\n> */\n> int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> {\n> -\t/* Before any configuration attempt, stop the camera if it's running. */\n> -\tif (running_) {\n> -\t\tworker_.stop();\n> -\t\tcamera_->stop();\n> -\t\trunning_ = false;\n> -\t}\n> +\t/* Before any configuration attempt, stop the camera. */\n> +\tstop();\n> \n> \t/*\n> \t * Generate an empty configuration, and construct a StreamConfiguration\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index 11bdfec8..39cf95ad 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -85,6 +85,8 @@ private:\n> \t\tint androidFormat;\n> \t};\n> \n> +\tvoid stop();\n> +\n> \tint initializeStreamConfigurations();\n> \tstd::vector\n> \tgetYUVResolutions(libcamera::CameraConfiguration *cameraConfig,","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id E9B68BD695\n\tfor ;\n\tFri, 2 Apr 2021 22:31:54 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3A82C68787;\n\tSat, 3 Apr 2021 00:31:54 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4E9B1602D7\n\tfor ;\n\tSat, 3 Apr 2021 00:31:51 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1204F3D7;\n\tSat, 3 Apr 2021 00:31:49 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"ivTr22W/\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1617402710;\n\tbh=v5h+WmlThZY8hdyFuTqVFzxtDBwVxONuOfCTQZmGgXY=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=ivTr22W/ZGPhkPxoyHcj2Ru878NM2QUe/f7SRNMbK1oBe5eWxNmhQJvrHH69Yp/s6\n\tvZz5n1Us8PlW26W+1yRykNRBmG2J5I6iUR83QGVlb9VIzyc5Qojm0w8TtDtm+Mfnij\n\tWK5RIRi7bhhmGGk9na4KB7HKvUR194OjNMaQcNIE=","Date":"Sat, 3 Apr 2021 01:31:04 +0300","From":"Laurent Pinchart ","To":"Hirokazu Honda ","Message-ID":"","References":"<20210402021238.1297591-1-hiroh@chromium.org>\n\t<20210402021238.1297591-2-hiroh@chromium.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210402021238.1297591-2-hiroh@chromium.org>","Subject":"Re: [libcamera-devel] [PATCH v5 1/2] android: CameraDevice: Add\n\tstop()","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]