{"id":22114,"url":"https://patchwork.libcamera.org/api/1.1/patches/22114/?format=json","web_url":"https://patchwork.libcamera.org/patch/22114/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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-4-chenghaoyang@chromium.org>","date":"2024-11-27T09:25:53","name":"[v2,3/9] android: Set StreamBuffer::srcBuffer in CameraDevice::processCaptureRequest","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"c875da84021ceba7414e75a5be09e1a95d028ee5","submitter":{"id":117,"url":"https://patchwork.libcamera.org/api/1.1/people/117/?format=json","name":"Cheng-Hao Yang","email":"chenghaoyang@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22114/mbox/","series":[{"id":4828,"url":"https://patchwork.libcamera.org/api/1.1/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/22114/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22114/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 2F0D2C3213\n\tfor ;\n\tWed, 27 Nov 2024 09:26:50 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 14DD1660C2;\n\tWed, 27 Nov 2024 10:26:49 +0100 (CET)","from mail-oa1-x33.google.com (mail-oa1-x33.google.com\n\t[IPv6:2001:4860:4864:20::33])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 00AB2660AD\n\tfor ;\n\tWed, 27 Nov 2024 10:26:43 +0100 (CET)","by mail-oa1-x33.google.com with SMTP id\n\t586e51a60fabf-2958ddf99a7so5985587fac.2\n\tfor ;\n\tWed, 27 Nov 2024 01:26:43 -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.40\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 27 Nov 2024 01:26:41 -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=\"INTFfrxP\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1732699602; x=1733304402;\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=gkEafkQKLiXPZ/Jkv3BAtdyW3Syk3pi66hwIh5mX3Kg=;\n\tb=INTFfrxP0DlQMMccxCIangQVSC0HkMMXCkdjvUMgLdrEF75fPyMKfn5JWGYYvyWE7a\n\taXzTqNv5sGR4MP+i7bAVmqvlllVexAtJF0hA8QyLJ47Ug2exoS6aBrrgHTSTDj587xvZ\n\tr1rvnbWhDpEPQry14KXhUkzPAhD9xepmTHi5I=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1732699602; x=1733304402;\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=gkEafkQKLiXPZ/Jkv3BAtdyW3Syk3pi66hwIh5mX3Kg=;\n\tb=ayEPQJthG79l/dDEDV/OWIEy3CB/rt3H5QZnebmIcqSgTG3qzXqnWu4jgwGQfQj4A3\n\tGWi50ejcUrg0iI6JNR0UFgMbVHTA+30Alv/rrJ6x9PTJUVui6P2cdV/dJI0OT8LicVng\n\tTBLQuvIQMwhqOuaLT+p+yDefyFsg33Eu+Mi+atj/npKei9hQlwSmLaByYofmTCcmHXz+\n\tP8uKLt4Sook6RwNVWsRKl9Nl2yBXdw4HgWjqKw7zV2H4QKnzspfok7iZEpaiR1cZuKnm\n\t9MkY6OX79J8McJa1swYOyAeIH6r1bZTe/1EQsxfTekMuaxpNKXm5GxAmYfd/qb1NL6Xa\n\t26MA==","X-Gm-Message-State":"AOJu0YxacKNJZnepM3+MKefWuWDhBUpwannRChsYrHJzZW6uw9oRBVoC\n\tB7WDbUPeo0hfhByanY23Y9SdjfCkwb9iSuudxozk40KDQVyngSLw8drndhBQe9yqDx1YeR9LYbU\n\t=","X-Gm-Gg":"ASbGnctmESWD/NG3Jreqo7YFcbNFgtEKhmFf8Fusy6UJl9R30P+CxSYTAT0lOGvOfdH\n\tfc/f3sppUOmMg5x0FzmpXP78gn0pFy43nSpshfP8OMTvLI/35jkcHL5qX9jzDid4DQ1arLjjGM3\n\tCbJnvO3uCJuN+ayKTLYXw2yMvQRT6FtCpvQgG8Jy6uLy6fcgJyl5eovK19JsHDakh+7PKzqeMQQ\n\t7kTzvm6AMqua9jOTlAMP3qLFIEYTkp2GnZgUZ17eWD/BS2vISzMMJVpbsz6LwiCrGIKSEgU5HON\n\twKOle4Ut3ehhgZokSURWbCanPj3y7OXt6L5ya4RCmkyMnqFY3W4agw==","X-Google-Smtp-Source":"AGHT+IGX9O2+8wobsriZv6lS9Aiw/HSGc3NBv9b4jgBUH4erXX0pxZ0f2Yxzqz5DWIlSeaj896fO1Q==","X-Received":"by 2002:a05:6870:ab07:b0:297:2bdc:f533 with SMTP id\n\t586e51a60fabf-29dc43056fdmr2179644fac.31.1732699602218; \n\tWed, 27 Nov 2024 01:26:42 -0800 (PST)","From":"Harvey Yang ","To":"libcamera-devel@lists.libcamera.org","Cc":"Harvey Yang ,\n\tHan-Lin Chen ","Subject":"[PATCH v2 3/9] android: Set StreamBuffer::srcBuffer in\n\tCameraDevice::processCaptureRequest","Date":"Wed, 27 Nov 2024 09:25:53 +0000","Message-ID":"<20241127092632.3145984-4-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":"StreamBuffer::srcBuffer was set right before being processed, while it\nwas already determined when being constructed. This patch sets the value\nin CameraDevice::processCaptureRequest.\n\nSigned-off-by: Han-Lin Chen \nCo-developed-by: Harvey Yang \nSigned-off-by: Harvey Yang \n---\n src/android/camera_device.cpp | 29 +++++++++++++++++++++--------\n 1 file changed, 21 insertions(+), 8 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 4e3bdc9cc..11613fac9 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -967,9 +967,9 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t * to a libcamera stream. Streams of type Mapped will be handled later.\n \t *\n \t * Collect the CameraStream associated to each requested capture stream.\n-\t * Since requestedStreams is an std:set<>, no duplications can happen.\n+\t * Since requestedStreams is an std:map<>, no duplications can happen.\n \t */\n-\tstd::set requestedStreams;\n+\tstd::map requestedBuffers;\n \tfor (const auto &[i, buffer] : utils::enumerate(descriptor->buffers_)) {\n \t\tCameraStream *cameraStream = buffer.stream;\n \t\tcamera3_stream_t *camera3Stream = cameraStream->camera3Stream();\n@@ -1008,6 +1008,8 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t\t\t\t\t cameraStream->configuration().size);\n \t\t\tframeBuffer = buffer.frameBuffer.get();\n \t\t\tacquireFence = std::move(buffer.fence);\n+\n+\t\t\trequestedBuffers[cameraStream] = frameBuffer;\n \t\t\tLOG(HAL, Debug) << ss.str() << \" (direct)\";\n \t\t\tbreak;\n \n@@ -1021,6 +1023,9 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t\t */\n \t\t\tframeBuffer = cameraStream->getBuffer();\n \t\t\tbuffer.internalBuffer = frameBuffer;\n+\t\t\tbuffer.srcBuffer = frameBuffer;\n+\n+\t\t\trequestedBuffers[cameraStream] = frameBuffer;\n \t\t\tLOG(HAL, Debug) << ss.str() << \" (internal)\";\n \n \t\t\tdescriptor->pendingStreamsToProcess_.insert(\n@@ -1036,8 +1041,6 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\tauto fence = std::make_unique(std::move(acquireFence));\n \t\tdescriptor->request_->addBuffer(cameraStream->stream(),\n \t\t\t\t\t\tframeBuffer, std::move(fence));\n-\n-\t\trequestedStreams.insert(cameraStream);\n \t}\n \n \t/*\n@@ -1068,8 +1071,19 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t */\n \t\tCameraStream *sourceStream = cameraStream->sourceStream();\n \t\tASSERT(sourceStream);\n-\t\tif (requestedStreams.find(sourceStream) != requestedStreams.end())\n+\t\tASSERT(sourceStream->type() == CameraStream::Type::Direct);\n+\n+\t\t/*\n+\t\t * If the buffer for the source stream has been requested as\n+\t\t * Direct, use its framebuffer as the source buffer for\n+\t\t * post-processing. No need to recycle the buffer since it's\n+\t\t * owned by Android.\n+\t\t */\n+\t\tauto iterDirectBuffer = requestedBuffers.find(sourceStream);\n+\t\tif (iterDirectBuffer != requestedBuffers.end()) {\n+\t\t\tbuffer.srcBuffer = iterDirectBuffer->second;\n \t\t\tcontinue;\n+\t\t}\n \n \t\t/*\n \t\t * If that's not the case, we need to add a buffer to the request\n@@ -1077,11 +1091,12 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t */\n \t\tFrameBuffer *frameBuffer = cameraStream->getBuffer();\n \t\tbuffer.internalBuffer = frameBuffer;\n+\t\tbuffer.srcBuffer = frameBuffer;\n \n \t\tdescriptor->request_->addBuffer(sourceStream->stream(),\n \t\t\t\t\t\tframeBuffer, nullptr);\n \n-\t\trequestedStreams.insert(sourceStream);\n+\t\trequestedBuffers[sourceStream] = frameBuffer;\n \t}\n \n \t/*\n@@ -1236,8 +1251,6 @@ void CameraDevice::requestComplete(Request *request)\n \t\t\tcontinue;\n \t\t}\n \n-\t\tbuffer->srcBuffer = src;\n-\n \t\t++iter;\n \t\tint ret = stream->process(buffer);\n \t\tif (ret) {\n","prefixes":["v2","3/9"]}