From patchwork Wed Dec 4 16:36:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cheng-Hao Yang X-Patchwork-Id: 22169 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 B8A08BDB1C for ; Wed, 4 Dec 2024 16:42:02 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 053BE660ED; Wed, 4 Dec 2024 17:42:01 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="kBtH2XNC"; dkim-atps=neutral Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DD043660EC for ; Wed, 4 Dec 2024 17:41:56 +0100 (CET) Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-7242f559a9fso30537b3a.1 for ; Wed, 04 Dec 2024 08:41:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1733330513; x=1733935313; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LcsRfFPzzANl9rpdLlsmIw3KAWzqxumyatnPESv6yy0=; b=kBtH2XNCLyNCaqY2wmoLZwNKFtp8K/slmgxxQkziJdvgrH1OqccdVGcUTiCY0uVaOQ Lx5Jhbn2uoPjGUf7wv7jyRP61J43J6YyFqVlvK2ANQV8Kj30yWGKbkX9UXeTfPIkjKdY yrWr2oLU5v3uyMDegQw+Pht99WBFmgWxtJFeE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733330513; x=1733935313; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LcsRfFPzzANl9rpdLlsmIw3KAWzqxumyatnPESv6yy0=; b=BlicmEQJ24fAW7vl1ZmPbrtISjj7fhIH5zp1gs5827YJ5d2ICf+WQmOYZsQcJT5UP7 KcFzBM90Gw+2v2UDGa8dVr3oE6kwUdxwWxRf1Ld91qbJk+6R1KkZA9/QJUfzADf2BIQl Fcr4hcDJhNgOj0N6iWQ5qhLWO3dTZjiOOds9KKuZRndzNPP5jQ4Xyyrfrovc7y0pf4D6 PKDiFGKomeZ/uEaA8KjFwVYOPHZarHHLi33Wk0Pg1nevUgXpKerfDZK/llusC5aEKwyH byScxgbRSglCfZJjq+NKLOIAxlrP4QhzwDWm80zS83ePh6MosvYLhr6/O3lNgNc2+CWw e1tg== X-Gm-Message-State: AOJu0YxdiK6Gbs/8kzEhcaLb7N2ATBCoVh2U9dHoxFsAjyqBml+4yF1R Rp/7gAiX9E32oAjymtTMj6SuoGslGYazuIgxgm2NSUsATSZKsK5DBHCX1GGOQZJy4yt9bHfnWjs = X-Gm-Gg: ASbGncv5OtQ6w2sXqGIqcYGishjgDY/QcZesQ+BbaGOX2oyqQJSkK7KRFKPQMe0oNbt WpPA39XXQ4Fc9MRrPlxE/C7jrVs3V0a+xG0oxqJS8oDFoSSVQ3ugc32bFDJrb3JgH6b8HlzNsBZ p1qxemIdAuXcl8SHi8vnF7D/IyXGCr+MAUiQVasACIvVq5ZpOq2PyE331oSp2UyL99+JjJHJm+j /YpgoNOlNUX1zJ5YpoZfai6RjkH6mlPgIVdSdxPRi70J1XJPmZy2rP8RnEI4GZEAby1ouEjdDIs 1X19YK9xt1p13sGY6a9LSQzsPyh/QDYLFcOx+K6n7E4vJppb+gD43f9a X-Google-Smtp-Source: AGHT+IHC4shiNXtPjF0zbg6RzFr3W5vWujFZzmYbm4Dm+KerLCezwoM9+4UWYWaj7y1k5fCXq1bDpA== X-Received: by 2002:a05:6a00:3a1b:b0:71e:2a0:b0d0 with SMTP id d2e1a72fcca58-7257fa7167emr9211118b3a.13.1733330513509; Wed, 04 Dec 2024 08:41:53 -0800 (PST) Received: from chenghaoyang-low.c.googlers.com.com (112.212.229.35.bc.googleusercontent.com. [35.229.212.112]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-725417725e9sm12551779b3a.80.2024.12.04.08.41.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Dec 2024 08:41:52 -0800 (PST) From: Harvey Yang To: libcamera-devel@lists.libcamera.org Cc: Harvey Yang , Han-Lin Chen Subject: [PATCH v3 7/7] android: Remove Camera3RequestDescriptor::streamsProcessMutex_ Date: Wed, 4 Dec 2024 16:36:32 +0000 Message-ID: <20241204164137.3938891-8-chenghaoyang@chromium.org> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog In-Reply-To: <20241204164137.3938891-1-chenghaoyang@chromium.org> References: <20241204164137.3938891-1-chenghaoyang@chromium.org> MIME-Version: 1.0 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" This mutex was needed when CameraStream's worker thread posts a result back to CameraDevice. We can simplify it by calling CameraDevice's function on libcamera::Camera's owner thread. With this delegation, `Camera3RequestDescriptor::pendingStreamsToProcess_` will be firstly setup in the application's thread in processCaptureRequest(), and the rest accesses will be done in libcamera::CameraManager's thread. Signed-off-by: Han-Lin Chen Co-developed-by: Harvey Yang Signed-off-by: Harvey Yang --- src/android/camera_device.cpp | 33 +++++++++++++++++---------------- src/android/camera_device.h | 6 ++++-- src/android/camera_request.h | 4 +--- src/android/camera_stream.cpp | 4 ++-- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 18e974f56..0e71a9f0c 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -990,8 +990,6 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques FrameBuffer *frameBuffer = nullptr; UniqueFD acquireFence; - MutexLocker lock(descriptor->streamsProcessMutex_); - switch (cameraStream->type()) { case CameraStream::Type::Mapped: /* Mapped streams will be handled in the next loop. */ @@ -1067,7 +1065,6 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques << cameraStream->configuration().pixelFormat << "]" << " (mapped)"; - MutexLocker lock(descriptor->streamsProcessMutex_); descriptor->pendingStreamsToProcess_.insert({ cameraStream, &buffer }); /* @@ -1242,9 +1239,6 @@ void CameraDevice::requestComplete(Request *request) descriptor->resultMetadata_ = std::make_unique(0, 0); } - /* Handle post-processing. */ - MutexLocker locker(descriptor->streamsProcessMutex_); - /* * Queue all the post-processing streams request at once. The completion * slot streamProcessingComplete() can only execute when we are out @@ -1272,10 +1266,8 @@ void CameraDevice::requestComplete(Request *request) } } - if (descriptor->pendingStreamsToProcess_.empty()) { - locker.unlock(); + if (descriptor->pendingStreamsToProcess_.empty()) completeDescriptor(descriptor); - } } /** @@ -1382,6 +1374,19 @@ void CameraDevice::setBufferStatus(StreamBuffer &streamBuffer, } } +void CameraDevice::streamProcessingCompleteDelegate(StreamBuffer *streamBuffer, + StreamBuffer::Status status) +{ + /* + * Delegate the callback to the camera manager thread to simplify race condition. + */ + auto *method = new BoundMethodMember{ + this, camera_.get(), &CameraDevice::streamProcessingComplete, ConnectionTypeQueued + }; + + method->activate(streamBuffer, status); +} + /** * \brief Handle post-processing completion of a stream in a capture request * \param[in] streamBuffer The StreamBuffer for which processing is complete @@ -1402,13 +1407,9 @@ void CameraDevice::streamProcessingComplete(StreamBuffer *streamBuffer, Camera3RequestDescriptor *request = streamBuffer->request; - { - MutexLocker locker(request->streamsProcessMutex_); - - request->pendingStreamsToProcess_.erase(streamBuffer->stream); - if (!request->pendingStreamsToProcess_.empty()) - return; - } + request->pendingStreamsToProcess_.erase(streamBuffer->stream); + if (!request->pendingStreamsToProcess_.empty()) + return; completeDescriptor(streamBuffer->request); } diff --git a/src/android/camera_device.h b/src/android/camera_device.h index 699aa8f17..69d163d76 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -65,8 +65,8 @@ public: int configureStreams(camera3_stream_configuration_t *stream_list); int processCaptureRequest(camera3_capture_request_t *request); void requestComplete(libcamera::Request *request); - void streamProcessingComplete(StreamBuffer *bufferStream, - StreamBuffer::Status status); + void streamProcessingCompleteDelegate(StreamBuffer *bufferStream, + StreamBuffer::Status status); protected: std::string logPrefix() const override; @@ -96,6 +96,8 @@ private: int processControls(Camera3RequestDescriptor *descriptor); void completeDescriptor(Camera3RequestDescriptor *descriptor) LIBCAMERA_TSA_EXCLUDES(descriptorsMutex_); + void streamProcessingComplete(StreamBuffer *bufferStream, + StreamBuffer::Status status); void sendCaptureResults() LIBCAMERA_TSA_REQUIRES(descriptorsMutex_); void sendCaptureResult(Camera3RequestDescriptor *request) const; void setBufferStatus(StreamBuffer &buffer, diff --git a/src/android/camera_request.h b/src/android/camera_request.h index 6b2a00795..bd75d4595 100644 --- a/src/android/camera_request.h +++ b/src/android/camera_request.h @@ -66,9 +66,7 @@ public: }; /* Keeps track of streams requiring post-processing. */ - std::map pendingStreamsToProcess_ - LIBCAMERA_TSA_GUARDED_BY(streamsProcessMutex_); - libcamera::Mutex streamsProcessMutex_; + std::map pendingStreamsToProcess_; Camera3RequestDescriptor(libcamera::Camera *camera, const camera3_capture_request_t *camera3Request); diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp index 53f292d4b..7837fd7aa 100644 --- a/src/android/camera_stream.cpp +++ b/src/android/camera_stream.cpp @@ -121,8 +121,8 @@ int CameraStream::configure() else bufferStatus = StreamBuffer::Status::Error; - cameraDevice_->streamProcessingComplete(streamBuffer, - bufferStatus); + cameraDevice_->streamProcessingCompleteDelegate(streamBuffer, + bufferStatus); }); worker_->start();