{"id":22118,"url":"https://patchwork.libcamera.org/api/patches/22118/?format=json","web_url":"https://patchwork.libcamera.org/patch/22118/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20241127092632.3145984-8-chenghaoyang@chromium.org>","date":"2024-11-27T09:25:57","name":"[v2,7/9] android: Remove Camera3RequestDescriptor::streamsProcessMutex_","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"9e7bc1b549d769baf8006ab17a303b8ad3cbfc98","submitter":{"id":117,"url":"https://patchwork.libcamera.org/api/people/117/?format=json","name":"Cheng-Hao Yang","email":"chenghaoyang@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22118/mbox/","series":[{"id":4828,"url":"https://patchwork.libcamera.org/api/series/4828/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4828","date":"2024-11-27T09:25:50","name":"Signal metadataAvailable and Android partial result","version":2,"mbox":"https://patchwork.libcamera.org/series/4828/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22118/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22118/checks/","tags":{},"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 29ED3C3213\n\tfor ;\n\tWed, 27 Nov 2024 09:26:59 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A59F5660D7;\n\tWed, 27 Nov 2024 10:26:58 +0100 (CET)","from mail-ot1-x330.google.com (mail-ot1-x330.google.com\n\t[IPv6:2607:f8b0:4864:20::330])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C2947660C4\n\tfor ;\n\tWed, 27 Nov 2024 10:26:49 +0100 (CET)","by mail-ot1-x330.google.com with SMTP id\n\t46e09a7af769-71d4c462ab1so1390747a34.0\n\tfor ;\n\tWed, 27 Nov 2024 01:26:49 -0800 (PST)","from chenghaoyang-low.c.googlers.com.com\n\t(27.247.221.35.bc.googleusercontent.com. [35.221.247.27])\n\tby smtp.gmail.com with ESMTPSA id\n\t41be03b00d2f7-7fbcbfc41f9sm8693027a12.8.2024.11.27.01.26.47\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 27 Nov 2024 01:26:47 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"csaFehX9\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1732699608; x=1733304408;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=vtXzRx/bGtcOeUBwLnIhf0TSMieqneRSDdL6wR8sPsI=;\n\tb=csaFehX9ijCuzV5eHRoRACyV6/AlhPdJAO69mrUz20/1RU6VlbOyGyTpzpgZ5TtxeD\n\tDqqNt2ZBqyLG4eIdCp1M2Fdm8COtHbuTkzTS56siRekopRzoOuHAvaes81rk0jogcad6\n\tjU3kQkbOihAMi2yLP+196Mt5dnRA3bArFJQKY=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1732699608; x=1733304408;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=vtXzRx/bGtcOeUBwLnIhf0TSMieqneRSDdL6wR8sPsI=;\n\tb=qKYVJJNfuLZ+amFoVvwu8qlf+d1sGYuWsQjVos1bxYms8SpMWUMVHTmS5okJN80pId\n\tVL9fGhRoXnYOp+vC23EHLFG4n+hW5+sIzFc+UWr2lF8zn1v8LUQClAl8zkT5KJY+88wh\n\toVg1EPW4gjbgcKdgNBjrM6OjiG+1qj7xDIax2fhA6eu21ih738PO6Xii31mrkH1K9tpU\n\t2OBVTre9yk2hZcIkJyrRnHKgYQaFJVyqkpgQSiv5UlyyKaPy/VDOLj96bvNZn+E9E+BY\n\tSBqQ/YfRSWoFVxZJpswEhqwQ6gtleqZs6oESbH8WAx1sTRf/ommLFcBZUXdEAWwaZIBT\n\tjYxw==","X-Gm-Message-State":"AOJu0YztDp4Eigr/9dIlQwdmIkYkJGFhbo4NxhSZHBfdhm11iDeGGaSu\n\tojLU/34/7y0pnOmc2OnTGo+ctvxxDFHO4afOhqkm/1diDmKaQHPBd9meWCCs1tJ3Yx/gGHcajuU\n\t=","X-Gm-Gg":"ASbGnctNMSHoxpK/6Fi0Gaw5vU49U+46/CW/cKP89i5NXUzxVBdedr3jvl9FYSBiJdF\n\towHxsxRtM/A2+jWgqV1YIEsJn30fSLxTEP/wJOGbttbvFnUSIVwDSekw/ZDFgK1tKrsoIQ+4uZK\n\tNLp+shnX/es78SqPoDF+f9Afl51I1XjsTxuhDlLhZnmLBQw+KDF0Cl3uwrv4BH7yDw93qjoRwCb\n\tiAmfvjr1Y+v+WAyTxKncbu3BF/45gw4NNNGCdunlWm+ntWNcXJEBB4ZedR1k6hB3tzAodVkizlc\n\tF7gnZnUjhkBUPR2rrW/0ZHqxBH1LcBdimAMCZJTJtJYVNekLx3WXUg==","X-Google-Smtp-Source":"AGHT+IEcBk0l7j0pXW0yfCYpqfM5tIad4tZ+ngME+MjUvHI6hhelFajbwNIyRv4Lmbfhcmgw0XKGng==","X-Received":"by 2002:a05:6830:6c09:b0:71d:5a2d:a1d9 with SMTP id\n\t46e09a7af769-71d65c94f26mr1887976a34.12.1732699608267; \n\tWed, 27 Nov 2024 01:26:48 -0800 (PST)","From":"Harvey Yang ","To":"libcamera-devel@lists.libcamera.org","Cc":"Harvey Yang ,\n\tHan-Lin Chen ","Subject":"[PATCH v2 7/9] android: Remove\n\tCamera3RequestDescriptor::streamsProcessMutex_","Date":"Wed, 27 Nov 2024 09:25:57 +0000","Message-ID":"<20241127092632.3145984-8-chenghaoyang@chromium.org>","X-Mailer":"git-send-email 2.47.0.338.g60cca15819-goog","In-Reply-To":"<20241127092632.3145984-1-chenghaoyang@chromium.org>","References":"<20241127092632.3145984-1-chenghaoyang@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"This mutex was needed when CameraStream's worker thread posts a result\nback to CameraDevice. We can simplify it by calling CameraDevice's\nfunction on libcamera::Camera's owner thread. With this delegation,\n`Camera3RequestDescriptor::pendingStreamsToProcess_` will be firstly\nsetup in the application's thread in processCaptureRequest(), and the\nrest accesses will be done in libcamera::CameraManager's thread.\n\nSigned-off-by: Han-Lin Chen \nCo-developed-by: Harvey Yang \nSigned-off-by: Harvey Yang \n---\n src/android/camera_device.cpp | 33 +++++++++++++++++----------------\n src/android/camera_device.h | 2 ++\n src/android/camera_request.h | 4 +---\n 3 files changed, 20 insertions(+), 19 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 3fb92268e..9fd851bc8 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -991,8 +991,6 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\tFrameBuffer *frameBuffer = nullptr;\n \t\tUniqueFD acquireFence;\n \n-\t\tMutexLocker lock(descriptor->streamsProcessMutex_);\n-\n \t\tswitch (cameraStream->type()) {\n \t\tcase CameraStream::Type::Mapped:\n \t\t\t/* Mapped streams will be handled in the next loop. */\n@@ -1068,7 +1066,6 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t\t\t<< cameraStream->configuration().pixelFormat << \"]\"\n \t\t\t\t<< \" (mapped)\";\n \n-\t\tMutexLocker lock(descriptor->streamsProcessMutex_);\n \t\tdescriptor->pendingStreamsToProcess_.insert({ cameraStream, &buffer });\n \n \t\t/*\n@@ -1242,9 +1239,6 @@ void CameraDevice::requestComplete(Request *request)\n \t\tdescriptor->resultMetadata_ = std::make_unique(0, 0);\n \t}\n \n-\t/* Handle post-processing. */\n-\tMutexLocker locker(descriptor->streamsProcessMutex_);\n-\n \t/*\n \t * Queue all the post-processing streams request at once. The completion\n \t * slot streamProcessingComplete() can only execute when we are out\n@@ -1272,10 +1266,8 @@ void CameraDevice::requestComplete(Request *request)\n \t\t}\n \t}\n \n-\tif (descriptor->pendingStreamsToProcess_.empty()) {\n-\t\tlocker.unlock();\n+\tif (descriptor->pendingStreamsToProcess_.empty())\n \t\tcompleteDescriptor(descriptor);\n-\t}\n }\n \n /**\n@@ -1382,6 +1374,19 @@ void CameraDevice::setBufferStatus(StreamBuffer &streamBuffer,\n \t}\n }\n \n+void CameraDevice::streamProcessingCompleteDelegate(StreamBuffer *streamBuffer,\n+\t\t\t\t\t\t StreamBuffer::Status status)\n+{\n+\t/*\n+\t * Delegate the callback to the camera manager thread to simplify race condition.\n+\t */\n+\tauto *method = new BoundMethodMember{\n+\t\tthis, camera_.get(), &CameraDevice::streamProcessingComplete, ConnectionTypeQueued\n+\t};\n+\n+\tmethod->activate(streamBuffer, status);\n+}\n+\n /**\n * \\brief Handle post-processing completion of a stream in a capture request\n * \\param[in] streamBuffer The StreamBuffer for which processing is complete\n@@ -1402,13 +1407,9 @@ void CameraDevice::streamProcessingComplete(StreamBuffer *streamBuffer,\n \n \tCamera3RequestDescriptor *request = streamBuffer->request;\n \n-\t{\n-\t\tMutexLocker locker(request->streamsProcessMutex_);\n-\n-\t\trequest->pendingStreamsToProcess_.erase(streamBuffer->stream);\n-\t\tif (!request->pendingStreamsToProcess_.empty())\n-\t\t\treturn;\n-\t}\n+\trequest->pendingStreamsToProcess_.erase(streamBuffer->stream);\n+\tif (!request->pendingStreamsToProcess_.empty())\n+\t\treturn;\n \n \tcompleteDescriptor(streamBuffer->request);\n }\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 699aa8f17..815a695d1 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -65,6 +65,8 @@ public:\n \tint configureStreams(camera3_stream_configuration_t *stream_list);\n \tint processCaptureRequest(camera3_capture_request_t *request);\n \tvoid requestComplete(libcamera::Request *request);\n+\tvoid streamProcessingCompleteDelegate(StreamBuffer *bufferStream,\n+\t\t\t\t\t StreamBuffer::Status status);\n \tvoid streamProcessingComplete(StreamBuffer *bufferStream,\n \t\t\t\t StreamBuffer::Status status);\n \ndiff --git a/src/android/camera_request.h b/src/android/camera_request.h\nindex 6b2a00795..bd75d4595 100644\n--- a/src/android/camera_request.h\n+++ b/src/android/camera_request.h\n@@ -66,9 +66,7 @@ public:\n \t};\n \n \t/* Keeps track of streams requiring post-processing. */\n-\tstd::map pendingStreamsToProcess_\n-\t\tLIBCAMERA_TSA_GUARDED_BY(streamsProcessMutex_);\n-\tlibcamera::Mutex streamsProcessMutex_;\n+\tstd::map pendingStreamsToProcess_;\n \n \tCamera3RequestDescriptor(libcamera::Camera *camera,\n \t\t\t\t const camera3_capture_request_t *camera3Request);\n","prefixes":["v2","7/9"]}