From patchwork Thu May 13 09:22:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 12262 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 7FEFAC31EE for ; Thu, 13 May 2021 09:22:08 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E04056891A; Thu, 13 May 2021 11:22:07 +0200 (CEST) Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B8E2E68919 for ; Thu, 13 May 2021 11:22:06 +0200 (CEST) Received: from uno.LocalDomain (93-61-96-190.ip145.fastwebnet.it [93.61.96.190]) (Authenticated sender: jacopo@jmondi.org) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id EB4BB240002; Thu, 13 May 2021 09:22:05 +0000 (UTC) From: Jacopo Mondi To: libcamera-devel@lists.libcamera.org Date: Thu, 13 May 2021 11:22:38 +0200 Message-Id: <20210513092246.42847-1-jacopo@jmondi.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 0/8] Implement flush() camera operation 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" Implement the flush() camera operation in Android CameraDevice class. The series includes the already sent "android: Rework request completion notification" patch slightly modified: - set partial_results = 0 in case of error (as reported by cros_camera_test) - on fatal ERROR_DEVICE notify() to the framework first then call Fatal. Record with a \todo the on-going discussion on the requirement to close the camera to handle failures gracefully. To get to a successfull implementation of flush() a bit of preparatory work is required as currently Requests that fails to queue to the pipeline handler are not returned to the application. Add Request::cancel() and call it in the PipelineHandler base class when calling queueRequestDevice() fails to allow application to keep track of the queued requests. On top of that, prepare the CameraDevice to support flush with a few clean-up patches, then implement the operation. No regression detected when running CTS in LIMITED mode. Tested with cros_camera_test: # cros_camera_test --gtest_filter="Camera3FrameTest/Camera3FlushRequestsTest*" [==========] 12 tests from 1 test suite ran. (1380 ms total) [ PASSED ] 12 tests. v1->v2: - The majority of patches in the series have not been changed if not for collecting tags. However 8/8 which implement the actual flush() has been changed to address Hiro's comment about protecting close() and configureStreams() from being concurrently run with flush(). - 8/8: - Introduce a new flushed_ condition variable to be used by close() and configureStreams() to be unlocked when flushing has terminated. - The patches that introduce Request::cancel() has pending discussion with Hiro and Niklas. As they impact the libcamera API I'll wait for Laurent to chime-in. Jacopo Mondi (8): android: Rework request completion notification libcamera: request: Add Request::cancel() libcamera: pipeline_handler: Notify Request queueing failure android: camera_device: Replace running_ with CameraState android: Replace scoped_lock<> with libcamera::MutexLocker android: Guard access to the camera state android: Rename CameraDevice::mutex_ android: Implement flush() camera operation include/libcamera/request.h | 1 + src/android/camera_device.cpp | 261 +++++++++++++++++++++-------- src/android/camera_device.h | 22 ++- src/android/camera_ops.cpp | 8 +- src/libcamera/pipeline_handler.cpp | 15 +- src/libcamera/request.cpp | 30 ++++ 6 files changed, 261 insertions(+), 76 deletions(-) --- 2.31.1