{"id":22163,"url":"https://patchwork.libcamera.org/api/1.1/patches/22163/?format=json","web_url":"https://patchwork.libcamera.org/patch/22163/","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":"<20241204164137.3938891-2-chenghaoyang@chromium.org>","date":"2024-12-04T16:36:26","name":"[v3,1/7] android: Move StreamBuffer out of Camera3RequestDescriptor","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"07bc8ca7af894b5bf91ad6d259c1e557506bdf11","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/22163/mbox/","series":[{"id":4847,"url":"https://patchwork.libcamera.org/api/1.1/series/4847/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4847","date":"2024-12-04T16:36:25","name":"Refactor Android HAL before supporting partial result","version":3,"mbox":"https://patchwork.libcamera.org/series/4847/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22163/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22163/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 87E51BDB1C\n\tfor ;\n\tWed, 4 Dec 2024 16:41:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 63852660DA;\n\tWed, 4 Dec 2024 17:41:49 +0100 (CET)","from mail-pf1-x435.google.com (mail-pf1-x435.google.com\n\t[IPv6:2607:f8b0:4864:20::435])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C3FBB660CE\n\tfor ;\n\tWed, 4 Dec 2024 17:41:46 +0100 (CET)","by mail-pf1-x435.google.com with SMTP id\n\td2e1a72fcca58-724f41d520cso18198b3a.1\n\tfor ;\n\tWed, 04 Dec 2024 08:41:46 -0800 (PST)","from chenghaoyang-low.c.googlers.com.com\n\t(112.212.229.35.bc.googleusercontent.com. [35.229.212.112])\n\tby smtp.gmail.com with ESMTPSA id\n\td2e1a72fcca58-725417725e9sm12551779b3a.80.2024.12.04.08.41.41\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 04 Dec 2024 08:41:42 -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=\"kGO1gp++\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1733330503; x=1733935303;\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=VzdjXSoSlpxLRIYtNCwI2M+hp0CGvhy+AVndgobM5W0=;\n\tb=kGO1gp++e9x0wz2vwzy8woXBeCHOdU9quydZyeWO2LEQWCnqjNc1ZzkB6+ywEXAIbp\n\tvpMd7pCzsCYJahn/3SORvBT7DtkVBP1HP0C2ojAEEVFtIQsjUpYztFaJckhCphu8gR56\n\tgajBxmJXifGWEH+1x6J9/azBWw9iZxe1sSQdc=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1733330503; x=1733935303;\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=VzdjXSoSlpxLRIYtNCwI2M+hp0CGvhy+AVndgobM5W0=;\n\tb=AVh38dkshE0RkWVmeezjzJrzBd9iE3F2X7KbXorbgggThBHvJMP2FjcdO8rh4KvxNJ\n\tTX0j5ZEGL6tHPr+RkTL6rYAiVqbr+pFduwx4KrMb03n8r4968nnVGR28qr33pD91A/2O\n\tpZoek+2JpCFmEVLSqgS2HMhU/bexjG2l9HamTpkz1lkLWquLw9hgyT8W3F31+NIjjLx1\n\tEXgvje2wZNoqjCf/1RKO2dYMByeUl9Ck2Mg3N47nbMZmjjCR91fYO/VnsRQ55qGjZmln\n\t5xZF4VEz9sdw0iEyNUhEmKiZT5BrEOWYo6urThImgErT9oZl/ca2EgR6aWexpd+aqltT\n\tkMWg==","X-Gm-Message-State":"AOJu0Yxjb3T/hdttxKYh+nchWF/4/2/2RszAQCZXgTKkg+TBISbDRQmm\n\taTocsLwG1ySAmwfo3DUA6GbSSc+a3wZLk07xrKcn9fuC7mfGGDhPhobwXitbErMd+q9JG7+42w8\n\t=","X-Gm-Gg":"ASbGncuMJzvKXDnqT10KYc2lRTtd/6fhwieTInrn4ej+t8V8MmBXkiX5J06St+uYxgO\n\ty8vbR5QWIqqX2Pz/M3g8rxER2ejM+jNq4gcVWtejR1YFd87JzMbFV8xFSAHwxx8tcxA6bjtsING\n\tzAnXLQGbhEMjyMnrejBrBNAnT8mCE9f64CdWMNr7VkuabVWw/Os6t/BWAOJjAtuEp5wRyOtR/c4\n\tXOCNm1TgSBIPZHynaclo0MtewWtXMFIGLdacPQ/pOntfR/V6ecK83gyjrkkhgGdu6KSlqxsGGzp\n\tD/ZDd3lY+0mb7H+8uM5L7IdqUJPeN0ht72WtU/fXaVlgVzP58ql18vlU","X-Google-Smtp-Source":"AGHT+IGo45GOB+Fm7QiQsYAu9EZofbaNWuy9lwJ4pHns9VHYeuKt54oW6oZyeMIp6gYYUvKYTTL8Hw==","X-Received":"by 2002:a05:6a00:2e87:b0:725:9ac3:f22 with SMTP id\n\td2e1a72fcca58-7259ac31270mr1191673b3a.1.1733330503326; \n\tWed, 04 Dec 2024 08:41:43 -0800 (PST)","From":"Harvey Yang ","To":"libcamera-devel@lists.libcamera.org","Cc":"Harvey Yang ,\n\tHan-Lin Chen ,\n\tJacopo Mondi ","Subject":"[PATCH v3 1/7] android: Move StreamBuffer out of\n\tCamera3RequestDescriptor","Date":"Wed, 4 Dec 2024 16:36:26 +0000","Message-ID":"<20241204164137.3938891-2-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","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":"Move StreamBuffer out of Camera3RequestDescriptor before applying\npartial result to Android adaptor.\n\nThis change makes it easier to add Camera3ResultDescriptor, which\nreferences both StreamBuffer and Camera3RequestDescriptor\n\nSigned-off-by: Han-Lin Chen \nCo-developed-by: Harvey Yang \nSigned-off-by: Harvey Yang \nReviewed-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 22 +++++-----\n src/android/camera_device.h | 8 ++--\n src/android/camera_request.cpp | 29 +++++++------\n src/android/camera_request.h | 53 ++++++++++++++----------\n src/android/camera_stream.cpp | 16 +++----\n src/android/camera_stream.h | 6 +--\n src/android/jpeg/encoder.h | 2 +-\n src/android/jpeg/encoder_jea.cpp | 2 +-\n src/android/jpeg/encoder_jea.h | 2 +-\n src/android/jpeg/encoder_libjpeg.cpp | 2 +-\n src/android/jpeg/encoder_libjpeg.h | 2 +-\n src/android/jpeg/post_processor_jpeg.cpp | 2 +-\n src/android/jpeg/post_processor_jpeg.h | 2 +-\n src/android/post_processor.h | 4 +-\n src/android/yuv/post_processor_yuv.cpp | 2 +-\n src/android/yuv/post_processor_yuv.h | 2 +-\n 16 files changed, 82 insertions(+), 74 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex a038131ae..4e3bdc9cc 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -865,7 +865,7 @@ void CameraDevice::abortRequest(Camera3RequestDescriptor *descriptor) const\n \tnotifyError(descriptor->frameNumber_, nullptr, CAMERA3_MSG_ERROR_REQUEST);\n \n \tfor (auto &buffer : descriptor->buffers_)\n-\t\tbuffer.status = Camera3RequestDescriptor::Status::Error;\n+\t\tbuffer.status = StreamBuffer::Status::Error;\n \n \tdescriptor->status_ = Camera3RequestDescriptor::Status::Error;\n }\n@@ -1163,7 +1163,7 @@ void CameraDevice::requestComplete(Request *request)\n \t\t\tif (fence)\n \t\t\t\tbuffer.fence = fence->release();\n \t\t}\n-\t\tbuffer.status = Camera3RequestDescriptor::Status::Success;\n+\t\tbuffer.status = StreamBuffer::Status::Success;\n \t}\n \n \t/*\n@@ -1226,12 +1226,12 @@ void CameraDevice::requestComplete(Request *request)\n \tauto iter = descriptor->pendingStreamsToProcess_.begin();\n \twhile (iter != descriptor->pendingStreamsToProcess_.end()) {\n \t\tCameraStream *stream = iter->first;\n-\t\tCamera3RequestDescriptor::StreamBuffer *buffer = iter->second;\n+\t\tStreamBuffer *buffer = iter->second;\n \n \t\tFrameBuffer *src = request->findBuffer(stream->stream());\n \t\tif (!src) {\n \t\t\tLOG(HAL, Error) << \"Failed to find a source stream buffer\";\n-\t\t\tsetBufferStatus(*buffer, Camera3RequestDescriptor::Status::Error);\n+\t\t\tsetBufferStatus(*buffer, StreamBuffer::Status::Error);\n \t\t\titer = descriptor->pendingStreamsToProcess_.erase(iter);\n \t\t\tcontinue;\n \t\t}\n@@ -1241,7 +1241,7 @@ void CameraDevice::requestComplete(Request *request)\n \t\t++iter;\n \t\tint ret = stream->process(buffer);\n \t\tif (ret) {\n-\t\t\tsetBufferStatus(*buffer, Camera3RequestDescriptor::Status::Error);\n+\t\t\tsetBufferStatus(*buffer, StreamBuffer::Status::Error);\n \t\t\tdescriptor->pendingStreamsToProcess_.erase(stream);\n \n \t\t\t/*\n@@ -1311,7 +1311,7 @@ void CameraDevice::sendCaptureResults()\n \t\tfor (auto &buffer : descriptor->buffers_) {\n \t\t\tcamera3_buffer_status status = CAMERA3_BUFFER_STATUS_ERROR;\n \n-\t\t\tif (buffer.status == Camera3RequestDescriptor::Status::Success)\n+\t\t\tif (buffer.status == StreamBuffer::Status::Success)\n \t\t\t\tstatus = CAMERA3_BUFFER_STATUS_OK;\n \n \t\t\t/*\n@@ -1335,11 +1335,11 @@ void CameraDevice::sendCaptureResults()\n \t}\n }\n \n-void CameraDevice::setBufferStatus(Camera3RequestDescriptor::StreamBuffer &streamBuffer,\n-\t\t\t\t Camera3RequestDescriptor::Status status)\n+void CameraDevice::setBufferStatus(StreamBuffer &streamBuffer,\n+\t\t\t\t StreamBuffer::Status status)\n {\n \tstreamBuffer.status = status;\n-\tif (status != Camera3RequestDescriptor::Status::Success) {\n+\tif (status != StreamBuffer::Status::Success) {\n \t\tnotifyError(streamBuffer.request->frameNumber_,\n \t\t\t streamBuffer.stream->camera3Stream(),\n \t\t\t CAMERA3_MSG_ERROR_BUFFER);\n@@ -1363,8 +1363,8 @@ void CameraDevice::setBufferStatus(Camera3RequestDescriptor::StreamBuffer &strea\n * be generated from post-processing have been completed. Mark the descriptor as\n * complete using completeDescriptor() in that case.\n */\n-void CameraDevice::streamProcessingComplete(Camera3RequestDescriptor::StreamBuffer *streamBuffer,\n-\t\t\t\t\t Camera3RequestDescriptor::Status status)\n+void CameraDevice::streamProcessingComplete(StreamBuffer *streamBuffer,\n+\t\t\t\t\t StreamBuffer::Status status)\n {\n \tsetBufferStatus(*streamBuffer, status);\n \ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 194ca3030..c92ee1aa4 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -65,8 +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 streamProcessingComplete(Camera3RequestDescriptor::StreamBuffer *bufferStream,\n-\t\t\t\t Camera3RequestDescriptor::Status status);\n+\tvoid streamProcessingComplete(StreamBuffer *bufferStream,\n+\t\t\t\t StreamBuffer::Status status);\n \n protected:\n \tstd::string logPrefix() const override;\n@@ -97,8 +97,8 @@ private:\n \tvoid completeDescriptor(Camera3RequestDescriptor *descriptor)\n \t\tLIBCAMERA_TSA_EXCLUDES(descriptorsMutex_);\n \tvoid sendCaptureResults() LIBCAMERA_TSA_REQUIRES(descriptorsMutex_);\n-\tvoid setBufferStatus(Camera3RequestDescriptor::StreamBuffer &buffer,\n-\t\t\t Camera3RequestDescriptor::Status status);\n+\tvoid setBufferStatus(StreamBuffer &buffer,\n+\t\t\t StreamBuffer::Status status);\n \tstd::unique_ptr getResultMetadata(\n \t\tconst Camera3RequestDescriptor &descriptor) const;\n \ndiff --git a/src/android/camera_request.cpp b/src/android/camera_request.cpp\nindex 0d45960d9..52a3ac1f7 100644\n--- a/src/android/camera_request.cpp\n+++ b/src/android/camera_request.cpp\n@@ -141,7 +141,7 @@ Camera3RequestDescriptor::Camera3RequestDescriptor(\n Camera3RequestDescriptor::~Camera3RequestDescriptor() = default;\n \n /**\n- * \\struct Camera3RequestDescriptor::StreamBuffer\n+ * \\class StreamBuffer\n * \\brief Group information for per-stream buffer of Camera3RequestDescriptor\n *\n * A capture request placed to the libcamera HAL can contain multiple streams.\n@@ -150,35 +150,35 @@ Camera3RequestDescriptor::~Camera3RequestDescriptor() = default;\n * generation. The generation of the stream will depend on its type (refer to\n * the CameraStream::Type documentation).\n *\n- * \\var Camera3RequestDescriptor::StreamBuffer::stream\n+ * \\var StreamBuffer::stream\n * \\brief Pointer to the corresponding CameraStream\n *\n- * \\var Camera3RequestDescriptor::StreamBuffer::camera3Buffer\n+ * \\var StreamBuffer::camera3Buffer\n * \\brief Native handle to the buffer\n *\n- * \\var Camera3RequestDescriptor::StreamBuffer::frameBuffer\n+ * \\var StreamBuffer::frameBuffer\n * \\brief Encapsulate the dmabuf handle inside a libcamera::FrameBuffer for\n * direct streams\n *\n- * \\var Camera3RequestDescriptor::StreamBuffer::fence\n+ * \\var StreamBuffer::fence\n * \\brief Acquire fence of the buffer\n *\n- * \\var Camera3RequestDescriptor::StreamBuffer::status\n+ * \\var StreamBuffer::status\n * \\brief Track the status of the buffer\n *\n- * \\var Camera3RequestDescriptor::StreamBuffer::internalBuffer\n+ * \\var StreamBuffer::internalBuffer\n * \\brief Pointer to a buffer internally handled by CameraStream (if any)\n *\n- * \\var Camera3RequestDescriptor::StreamBuffer::srcBuffer\n+ * \\var StreamBuffer::srcBuffer\n * \\brief Pointer to the source frame buffer used for post-processing\n *\n- * \\var Camera3RequestDescriptor::StreamBuffer::dstBuffer\n+ * \\var StreamBuffer::dstBuffer\n * \\brief Pointer to the destination frame buffer used for post-processing\n *\n- * \\var Camera3RequestDescriptor::StreamBuffer::request\n+ * \\var StreamBuffer::request\n * \\brief Back pointer to the Camera3RequestDescriptor to which the StreamBuffer belongs\n */\n-Camera3RequestDescriptor::StreamBuffer::StreamBuffer(\n+StreamBuffer::StreamBuffer(\n \tCameraStream *cameraStream, const camera3_stream_buffer_t &buffer,\n \tCamera3RequestDescriptor *requestDescriptor)\n \t: stream(cameraStream), camera3Buffer(buffer.buffer),\n@@ -186,9 +186,8 @@ Camera3RequestDescriptor::StreamBuffer::StreamBuffer(\n {\n }\n \n-Camera3RequestDescriptor::StreamBuffer::~StreamBuffer() = default;\n+StreamBuffer::~StreamBuffer() = default;\n \n-Camera3RequestDescriptor::StreamBuffer::StreamBuffer(StreamBuffer &&) = default;\n+StreamBuffer::StreamBuffer(StreamBuffer &&) = default;\n \n-Camera3RequestDescriptor::StreamBuffer &\n-Camera3RequestDescriptor::StreamBuffer::operator=(Camera3RequestDescriptor::StreamBuffer &&) = default;\n+StreamBuffer &StreamBuffer::operator=(StreamBuffer &&) = default;\ndiff --git a/src/android/camera_request.h b/src/android/camera_request.h\nindex 5b479180f..335f1985d 100644\n--- a/src/android/camera_request.h\n+++ b/src/android/camera_request.h\n@@ -26,7 +26,9 @@\n class CameraBuffer;\n class CameraStream;\n \n-class Camera3RequestDescriptor\n+class Camera3RequestDescriptor;\n+\n+class StreamBuffer\n {\n public:\n \tenum class Status {\n@@ -34,27 +36,34 @@ public:\n \t\tError,\n \t};\n \n-\tstruct StreamBuffer {\n-\t\tStreamBuffer(CameraStream *stream,\n-\t\t\t const camera3_stream_buffer_t &buffer,\n-\t\t\t Camera3RequestDescriptor *request);\n-\t\t~StreamBuffer();\n-\n-\t\tStreamBuffer(StreamBuffer &&);\n-\t\tStreamBuffer &operator=(StreamBuffer &&);\n-\n-\t\tCameraStream *stream;\n-\t\tbuffer_handle_t *camera3Buffer;\n-\t\tstd::unique_ptr frameBuffer;\n-\t\tlibcamera::UniqueFD fence;\n-\t\tStatus status = Status::Success;\n-\t\tlibcamera::FrameBuffer *internalBuffer = nullptr;\n-\t\tconst libcamera::FrameBuffer *srcBuffer = nullptr;\n-\t\tstd::unique_ptr dstBuffer;\n-\t\tCamera3RequestDescriptor *request;\n-\n-\tprivate:\n-\t\tLIBCAMERA_DISABLE_COPY(StreamBuffer)\n+\tStreamBuffer(CameraStream *stream,\n+\t\t const camera3_stream_buffer_t &buffer,\n+\t\t Camera3RequestDescriptor *request);\n+\t~StreamBuffer();\n+\n+\tStreamBuffer(StreamBuffer &&);\n+\tStreamBuffer &operator=(StreamBuffer &&);\n+\n+\tCameraStream *stream;\n+\tbuffer_handle_t *camera3Buffer;\n+\tstd::unique_ptr frameBuffer;\n+\tlibcamera::UniqueFD fence;\n+\tStatus status = Status::Success;\n+\tlibcamera::FrameBuffer *internalBuffer = nullptr;\n+\tconst libcamera::FrameBuffer *srcBuffer = nullptr;\n+\tstd::unique_ptr dstBuffer;\n+\tCamera3RequestDescriptor *request;\n+\n+private:\n+\tLIBCAMERA_DISABLE_COPY(StreamBuffer)\n+};\n+\n+class Camera3RequestDescriptor\n+{\n+public:\n+\tenum class Status {\n+\t\tSuccess,\n+\t\tError,\n \t};\n \n \t/* Keeps track of streams requiring post-processing. */\ndiff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\nindex 1d68540d7..53f292d4b 100644\n--- a/src/android/camera_stream.cpp\n+++ b/src/android/camera_stream.cpp\n@@ -112,14 +112,14 @@ int CameraStream::configure()\n \n \t\tworker_ = std::make_unique(postProcessor_.get());\n \t\tpostProcessor_->processComplete.connect(\n-\t\t\tthis, [&](Camera3RequestDescriptor::StreamBuffer *streamBuffer,\n+\t\t\tthis, [&](StreamBuffer *streamBuffer,\n \t\t\t\t PostProcessor::Status status) {\n-\t\t\t\tCamera3RequestDescriptor::Status bufferStatus;\n+\t\t\t\tStreamBuffer::Status bufferStatus;\n \n \t\t\t\tif (status == PostProcessor::Status::Success)\n-\t\t\t\t\tbufferStatus = Camera3RequestDescriptor::Status::Success;\n+\t\t\t\t\tbufferStatus = StreamBuffer::Status::Success;\n \t\t\t\telse\n-\t\t\t\t\tbufferStatus = Camera3RequestDescriptor::Status::Error;\n+\t\t\t\t\tbufferStatus = StreamBuffer::Status::Error;\n \n \t\t\t\tcameraDevice_->streamProcessingComplete(streamBuffer,\n \t\t\t\t\t\t\t\t\tbufferStatus);\n@@ -165,7 +165,7 @@ int CameraStream::waitFence(int fence)\n \treturn -errno;\n }\n \n-int CameraStream::process(Camera3RequestDescriptor::StreamBuffer *streamBuffer)\n+int CameraStream::process(StreamBuffer *streamBuffer)\n {\n \tASSERT(type_ != Type::Direct);\n \n@@ -283,7 +283,7 @@ void CameraStream::PostProcessorWorker::start()\n \tThread::start();\n }\n \n-void CameraStream::PostProcessorWorker::queueRequest(Camera3RequestDescriptor::StreamBuffer *dest)\n+void CameraStream::PostProcessorWorker::queueRequest(StreamBuffer *dest)\n {\n \t{\n \t\tMutexLocker lock(mutex_);\n@@ -306,7 +306,7 @@ void CameraStream::PostProcessorWorker::run()\n \t\tif (state_ != State::Running)\n \t\t\tbreak;\n \n-\t\tCamera3RequestDescriptor::StreamBuffer *streamBuffer = requests_.front();\n+\t\tStreamBuffer *streamBuffer = requests_.front();\n \t\trequests_.pop();\n \t\tlocker.unlock();\n \n@@ -316,7 +316,7 @@ void CameraStream::PostProcessorWorker::run()\n \t}\n \n \tif (state_ == State::Flushing) {\n-\t\tstd::queue requests =\n+\t\tstd::queue requests =\n \t\t\tstd::move(requests_);\n \t\tlocker.unlock();\n \ndiff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\nindex 395552dac..30f64f690 100644\n--- a/src/android/camera_stream.h\n+++ b/src/android/camera_stream.h\n@@ -127,7 +127,7 @@ public:\n \tCameraStream *sourceStream() const { return sourceStream_; }\n \n \tint configure();\n-\tint process(Camera3RequestDescriptor::StreamBuffer *streamBuffer);\n+\tint process(StreamBuffer *streamBuffer);\n \tlibcamera::FrameBuffer *getBuffer();\n \tvoid putBuffer(libcamera::FrameBuffer *buffer);\n \tvoid flush();\n@@ -146,7 +146,7 @@ private:\n \t\t~PostProcessorWorker();\n \n \t\tvoid start();\n-\t\tvoid queueRequest(Camera3RequestDescriptor::StreamBuffer *request);\n+\t\tvoid queueRequest(StreamBuffer *request);\n \t\tvoid flush();\n \n \tprotected:\n@@ -158,7 +158,7 @@ private:\n \t\tlibcamera::Mutex mutex_;\n \t\tlibcamera::ConditionVariable cv_;\n \n-\t\tstd::queue requests_\n+\t\tstd::queue requests_\n \t\t\tLIBCAMERA_TSA_GUARDED_BY(mutex_);\n \n \t\tState state_ LIBCAMERA_TSA_GUARDED_BY(mutex_) = State::Stopped;\ndiff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h\nindex ed033c191..25425d92c 100644\n--- a/src/android/jpeg/encoder.h\n+++ b/src/android/jpeg/encoder.h\n@@ -20,7 +20,7 @@ public:\n \tvirtual ~Encoder() = default;\n \n \tvirtual int configure(const libcamera::StreamConfiguration &cfg) = 0;\n-\tvirtual int encode(Camera3RequestDescriptor::StreamBuffer *buffer,\n+\tvirtual int encode(StreamBuffer *buffer,\n \t\t\t libcamera::Span exifData,\n \t\t\t unsigned int quality) = 0;\n };\ndiff --git a/src/android/jpeg/encoder_jea.cpp b/src/android/jpeg/encoder_jea.cpp\nindex 25dc43173..b3ad04638 100644\n--- a/src/android/jpeg/encoder_jea.cpp\n+++ b/src/android/jpeg/encoder_jea.cpp\n@@ -33,7 +33,7 @@ int EncoderJea::configure(const libcamera::StreamConfiguration &cfg)\n \treturn 0;\n }\n \n-int EncoderJea::encode(Camera3RequestDescriptor::StreamBuffer *buffer,\n+int EncoderJea::encode(StreamBuffer *buffer,\n \t\t libcamera::Span exifData,\n \t\t unsigned int quality)\n {\ndiff --git a/src/android/jpeg/encoder_jea.h b/src/android/jpeg/encoder_jea.h\nindex 91115d2e9..79265ebc6 100644\n--- a/src/android/jpeg/encoder_jea.h\n+++ b/src/android/jpeg/encoder_jea.h\n@@ -20,7 +20,7 @@ public:\n \t~EncoderJea();\n \n \tint configure(const libcamera::StreamConfiguration &cfg) override;\n-\tint encode(Camera3RequestDescriptor::StreamBuffer *buffer,\n+\tint encode(StreamBuffer *buffer,\n \t\t libcamera::Span exifData,\n \t\t unsigned int quality) override;\n \ndiff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp\nindex cb242b5ec..cb123576a 100644\n--- a/src/android/jpeg/encoder_libjpeg.cpp\n+++ b/src/android/jpeg/encoder_libjpeg.cpp\n@@ -180,7 +180,7 @@ void EncoderLibJpeg::compressNV(const std::vector> &planes)\n \t}\n }\n \n-int EncoderLibJpeg::encode(Camera3RequestDescriptor::StreamBuffer *buffer,\n+int EncoderLibJpeg::encode(StreamBuffer *buffer,\n \t\t\t libcamera::Span exifData,\n \t\t\t unsigned int quality)\n {\ndiff --git a/src/android/jpeg/encoder_libjpeg.h b/src/android/jpeg/encoder_libjpeg.h\nindex 4ac85c22e..de04b17d1 100644\n--- a/src/android/jpeg/encoder_libjpeg.h\n+++ b/src/android/jpeg/encoder_libjpeg.h\n@@ -22,7 +22,7 @@ public:\n \t~EncoderLibJpeg();\n \n \tint configure(const libcamera::StreamConfiguration &cfg) override;\n-\tint encode(Camera3RequestDescriptor::StreamBuffer *buffer,\n+\tint encode(StreamBuffer *buffer,\n \t\t libcamera::Span exifData,\n \t\t unsigned int quality) override;\n \tint encode(const std::vector> &planes,\ndiff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp\nindex 89b8a401e..f5a90785d 100644\n--- a/src/android/jpeg/post_processor_jpeg.cpp\n+++ b/src/android/jpeg/post_processor_jpeg.cpp\n@@ -106,7 +106,7 @@ void PostProcessorJpeg::generateThumbnail(const FrameBuffer &source,\n \t}\n }\n \n-void PostProcessorJpeg::process(Camera3RequestDescriptor::StreamBuffer *streamBuffer)\n+void PostProcessorJpeg::process(StreamBuffer *streamBuffer)\n {\n \tASSERT(encoder_);\n \ndiff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h\nindex 6fe214577..5421f233e 100644\n--- a/src/android/jpeg/post_processor_jpeg.h\n+++ b/src/android/jpeg/post_processor_jpeg.h\n@@ -22,7 +22,7 @@ public:\n \n \tint configure(const libcamera::StreamConfiguration &incfg,\n \t\t const libcamera::StreamConfiguration &outcfg) override;\n-\tvoid process(Camera3RequestDescriptor::StreamBuffer *streamBuffer) override;\n+\tvoid process(StreamBuffer *streamBuffer) override;\n \n private:\n \tvoid generateThumbnail(const libcamera::FrameBuffer &source,\ndiff --git a/src/android/post_processor.h b/src/android/post_processor.h\nindex b504a3796..f2e00d2b1 100644\n--- a/src/android/post_processor.h\n+++ b/src/android/post_processor.h\n@@ -27,7 +27,7 @@ public:\n \n \tvirtual int configure(const libcamera::StreamConfiguration &inCfg,\n \t\t\t const libcamera::StreamConfiguration &outCfg) = 0;\n-\tvirtual void process(Camera3RequestDescriptor::StreamBuffer *streamBuffer) = 0;\n+\tvirtual void process(StreamBuffer *streamBuffer) = 0;\n \n-\tlibcamera::Signal processComplete;\n+\tlibcamera::Signal processComplete;\n };\ndiff --git a/src/android/yuv/post_processor_yuv.cpp b/src/android/yuv/post_processor_yuv.cpp\nindex c998807b0..b05623b23 100644\n--- a/src/android/yuv/post_processor_yuv.cpp\n+++ b/src/android/yuv/post_processor_yuv.cpp\n@@ -49,7 +49,7 @@ int PostProcessorYuv::configure(const StreamConfiguration &inCfg,\n \treturn 0;\n }\n \n-void PostProcessorYuv::process(Camera3RequestDescriptor::StreamBuffer *streamBuffer)\n+void PostProcessorYuv::process(StreamBuffer *streamBuffer)\n {\n \tconst FrameBuffer &source = *streamBuffer->srcBuffer;\n \tCameraBuffer *destination = streamBuffer->dstBuffer.get();\ndiff --git a/src/android/yuv/post_processor_yuv.h b/src/android/yuv/post_processor_yuv.h\nindex ed7bb1fbe..459c6685e 100644\n--- a/src/android/yuv/post_processor_yuv.h\n+++ b/src/android/yuv/post_processor_yuv.h\n@@ -18,7 +18,7 @@ public:\n \n \tint configure(const libcamera::StreamConfiguration &incfg,\n \t\t const libcamera::StreamConfiguration &outcfg) override;\n-\tvoid process(Camera3RequestDescriptor::StreamBuffer *streamBuffer) override;\n+\tvoid process(StreamBuffer *streamBuffer) override;\n \n private:\n \tbool isValidBuffers(const libcamera::FrameBuffer &source,\n","prefixes":["v3","1/7"]}