[{"id":32427,"web_url":"https://patchwork.libcamera.org/comment/32427/","msgid":"","date":"2024-11-28T13:06:58","subject":"Re: [PATCH v2 2/9] android: Move StreamBuffer out of\n\tCamera3RequestDescriptor","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/people/143/","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"content":"Hi Harvey\n\nOn Wed, Nov 27, 2024 at 09:25:52AM +0000, Harvey Yang wrote:\n> Move StreamBuffer out of Camera3RequestDescriptor as a refactory before\n\ns/as a refactory//\n\n> applying partial result to Android adaptor. For easier adding\n> Camera3ResultDescriptor which references both StreamBuffer and\n> Camera3RequestDescriptor.\n\nI presume you mean\n\n\"This change makes it easier to add Camera3ResultDescriptor, which\nreferences both StreamBuffer and Camera3RequestDescriptor\"\n\n>\n> Signed-off-by: Han-Lin Chen \n> Co-developed-by: Harvey Yang \n> Signed-off-by: Harvey Yang \n\nThe patch itself is ok, let's see how it is used\n\nReviewed-by: Jacopo Mondi \n\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(-)\n>\n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 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>\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index 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>\n> diff --git a/src/android/camera_request.cpp b/src/android/camera_request.cpp\n> index 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;\n> diff --git a/src/android/camera_request.h b/src/android/camera_request.h\n> index 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. */\n> diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n> index 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>\n> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> index 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;\n> diff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h\n> index 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> };\n> diff --git a/src/android/jpeg/encoder_jea.cpp b/src/android/jpeg/encoder_jea.cpp\n> index 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> {\n> diff --git a/src/android/jpeg/encoder_jea.h b/src/android/jpeg/encoder_jea.h\n> index 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>\n> diff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp\n> index 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> {\n> diff --git a/src/android/jpeg/encoder_libjpeg.h b/src/android/jpeg/encoder_libjpeg.h\n> index 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,\n> diff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp\n> index 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>\n> diff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h\n> index 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,\n> diff --git a/src/android/post_processor.h b/src/android/post_processor.h\n> index 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> };\n> diff --git a/src/android/yuv/post_processor_yuv.cpp b/src/android/yuv/post_processor_yuv.cpp\n> index 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();\n> diff --git a/src/android/yuv/post_processor_yuv.h b/src/android/yuv/post_processor_yuv.h\n> index 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> --\n> 2.47.0.338.g60cca15819-goog\n>","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 8CC6ABDE6B\n\tfor ;\n\tThu, 28 Nov 2024 13:07:04 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9328465F93;\n\tThu, 28 Nov 2024 14:07:03 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 24B9365898\n\tfor ;\n\tThu, 28 Nov 2024 14:07:02 +0100 (CET)","from ideasonboard.com (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3526A526;\n\tThu, 28 Nov 2024 14:06:38 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"LwwIbp/P\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1732799198;\n\tbh=KbKCZbEebl+Eo1xNVjUd8TH5t0ERwYQiUb21+wYNS/Y=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=LwwIbp/Pg1tUaeqMHTBB4TsqYPjN7jJkz27jj6MoGx9jpGe0kHVZES+31ocC36uEx\n\t+fWHJxq2FU1IxCjO1jxNxzAm9ixbghe3pYfqu85DJpLhwC5jI/lYLpzz3cyHBejK4g\n\tWwWx88vawbzocQz5O5ediFHi9xMS8CWgbz7lNnsc=","Date":"Thu, 28 Nov 2024 14:06:58 +0100","From":"Jacopo Mondi ","To":"Harvey Yang ","Cc":"libcamera-devel@lists.libcamera.org, \n\tHan-Lin Chen ","Subject":"Re: [PATCH v2 2/9] android: Move StreamBuffer out of\n\tCamera3RequestDescriptor","Message-ID":"","References":"<20241127092632.3145984-1-chenghaoyang@chromium.org>\n\t<20241127092632.3145984-3-chenghaoyang@chromium.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20241127092632.3145984-3-chenghaoyang@chromium.org>","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\" "}},{"id":32448,"web_url":"https://patchwork.libcamera.org/comment/32448/","msgid":"","date":"2024-11-29T07:06:53","subject":"Re: [PATCH v2 2/9] android: Move StreamBuffer out of\n\tCamera3RequestDescriptor","submitter":{"id":117,"url":"https://patchwork.libcamera.org/api/people/117/","name":"Cheng-Hao Yang","email":"chenghaoyang@chromium.org"},"content":"Hi Jacopo,\n\nOn Thu, Nov 28, 2024 at 9:07 PM Jacopo Mondi\n wrote:\n>\n> Hi Harvey\n>\n> On Wed, Nov 27, 2024 at 09:25:52AM +0000, Harvey Yang wrote:\n> > Move StreamBuffer out of Camera3RequestDescriptor as a refactory before\n>\n> s/as a refactory//\n\nDone\n\n>\n> > applying partial result to Android adaptor. For easier adding\n> > Camera3ResultDescriptor which references both StreamBuffer and\n> > Camera3RequestDescriptor.\n>\n> I presume you mean\n>\n> \"This change makes it easier to add Camera3ResultDescriptor, which\n> references both StreamBuffer and Camera3RequestDescriptor\"\n\nThanks, updated.\n\n>\n> >\n> > Signed-off-by: Han-Lin Chen \n> > Co-developed-by: Harvey Yang \n> > Signed-off-by: Harvey Yang \n>\n> The patch itself is ok, let's see how it is used\n>\n> Reviewed-by: Jacopo Mondi \n>\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(-)\n> >\n> > diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> > index 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> > notifyError(descriptor->frameNumber_, nullptr, CAMERA3_MSG_ERROR_REQUEST);\n> >\n> > for (auto &buffer : descriptor->buffers_)\n> > - buffer.status = Camera3RequestDescriptor::Status::Error;\n> > + buffer.status = StreamBuffer::Status::Error;\n> >\n> > descriptor->status_ = Camera3RequestDescriptor::Status::Error;\n> > }\n> > @@ -1163,7 +1163,7 @@ void CameraDevice::requestComplete(Request *request)\n> > if (fence)\n> > buffer.fence = fence->release();\n> > }\n> > - buffer.status = Camera3RequestDescriptor::Status::Success;\n> > + buffer.status = StreamBuffer::Status::Success;\n> > }\n> >\n> > /*\n> > @@ -1226,12 +1226,12 @@ void CameraDevice::requestComplete(Request *request)\n> > auto iter = descriptor->pendingStreamsToProcess_.begin();\n> > while (iter != descriptor->pendingStreamsToProcess_.end()) {\n> > CameraStream *stream = iter->first;\n> > - Camera3RequestDescriptor::StreamBuffer *buffer = iter->second;\n> > + StreamBuffer *buffer = iter->second;\n> >\n> > FrameBuffer *src = request->findBuffer(stream->stream());\n> > if (!src) {\n> > LOG(HAL, Error) << \"Failed to find a source stream buffer\";\n> > - setBufferStatus(*buffer, Camera3RequestDescriptor::Status::Error);\n> > + setBufferStatus(*buffer, StreamBuffer::Status::Error);\n> > iter = descriptor->pendingStreamsToProcess_.erase(iter);\n> > continue;\n> > }\n> > @@ -1241,7 +1241,7 @@ void CameraDevice::requestComplete(Request *request)\n> > ++iter;\n> > int ret = stream->process(buffer);\n> > if (ret) {\n> > - setBufferStatus(*buffer, Camera3RequestDescriptor::Status::Error);\n> > + setBufferStatus(*buffer, StreamBuffer::Status::Error);\n> > descriptor->pendingStreamsToProcess_.erase(stream);\n> >\n> > /*\n> > @@ -1311,7 +1311,7 @@ void CameraDevice::sendCaptureResults()\n> > for (auto &buffer : descriptor->buffers_) {\n> > camera3_buffer_status status = CAMERA3_BUFFER_STATUS_ERROR;\n> >\n> > - if (buffer.status == Camera3RequestDescriptor::Status::Success)\n> > + if (buffer.status == StreamBuffer::Status::Success)\n> > status = CAMERA3_BUFFER_STATUS_OK;\n> >\n> > /*\n> > @@ -1335,11 +1335,11 @@ void CameraDevice::sendCaptureResults()\n> > }\n> > }\n> >\n> > -void CameraDevice::setBufferStatus(Camera3RequestDescriptor::StreamBuffer &streamBuffer,\n> > - Camera3RequestDescriptor::Status status)\n> > +void CameraDevice::setBufferStatus(StreamBuffer &streamBuffer,\n> > + StreamBuffer::Status status)\n> > {\n> > streamBuffer.status = status;\n> > - if (status != Camera3RequestDescriptor::Status::Success) {\n> > + if (status != StreamBuffer::Status::Success) {\n> > notifyError(streamBuffer.request->frameNumber_,\n> > streamBuffer.stream->camera3Stream(),\n> > 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> > - Camera3RequestDescriptor::Status status)\n> > +void CameraDevice::streamProcessingComplete(StreamBuffer *streamBuffer,\n> > + StreamBuffer::Status status)\n> > {\n> > setBufferStatus(*streamBuffer, status);\n> >\n> > diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> > index 194ca3030..c92ee1aa4 100644\n> > --- a/src/android/camera_device.h\n> > +++ b/src/android/camera_device.h\n> > @@ -65,8 +65,8 @@ public:\n> > int configureStreams(camera3_stream_configuration_t *stream_list);\n> > int processCaptureRequest(camera3_capture_request_t *request);\n> > void requestComplete(libcamera::Request *request);\n> > - void streamProcessingComplete(Camera3RequestDescriptor::StreamBuffer *bufferStream,\n> > - Camera3RequestDescriptor::Status status);\n> > + void streamProcessingComplete(StreamBuffer *bufferStream,\n> > + StreamBuffer::Status status);\n> >\n> > protected:\n> > std::string logPrefix() const override;\n> > @@ -97,8 +97,8 @@ private:\n> > void completeDescriptor(Camera3RequestDescriptor *descriptor)\n> > LIBCAMERA_TSA_EXCLUDES(descriptorsMutex_);\n> > void sendCaptureResults() LIBCAMERA_TSA_REQUIRES(descriptorsMutex_);\n> > - void setBufferStatus(Camera3RequestDescriptor::StreamBuffer &buffer,\n> > - Camera3RequestDescriptor::Status status);\n> > + void setBufferStatus(StreamBuffer &buffer,\n> > + StreamBuffer::Status status);\n> > std::unique_ptr getResultMetadata(\n> > const Camera3RequestDescriptor &descriptor) const;\n> >\n> > diff --git a/src/android/camera_request.cpp b/src/android/camera_request.cpp\n> > index 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> > CameraStream *cameraStream, const camera3_stream_buffer_t &buffer,\n> > Camera3RequestDescriptor *requestDescriptor)\n> > : 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;\n> > diff --git a/src/android/camera_request.h b/src/android/camera_request.h\n> > index 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> > enum class Status {\n> > @@ -34,27 +36,34 @@ public:\n> > Error,\n> > };\n> >\n> > - struct StreamBuffer {\n> > - StreamBuffer(CameraStream *stream,\n> > - const camera3_stream_buffer_t &buffer,\n> > - Camera3RequestDescriptor *request);\n> > - ~StreamBuffer();\n> > -\n> > - StreamBuffer(StreamBuffer &&);\n> > - StreamBuffer &operator=(StreamBuffer &&);\n> > -\n> > - CameraStream *stream;\n> > - buffer_handle_t *camera3Buffer;\n> > - std::unique_ptr frameBuffer;\n> > - libcamera::UniqueFD fence;\n> > - Status status = Status::Success;\n> > - libcamera::FrameBuffer *internalBuffer = nullptr;\n> > - const libcamera::FrameBuffer *srcBuffer = nullptr;\n> > - std::unique_ptr dstBuffer;\n> > - Camera3RequestDescriptor *request;\n> > -\n> > - private:\n> > - LIBCAMERA_DISABLE_COPY(StreamBuffer)\n> > + StreamBuffer(CameraStream *stream,\n> > + const camera3_stream_buffer_t &buffer,\n> > + Camera3RequestDescriptor *request);\n> > + ~StreamBuffer();\n> > +\n> > + StreamBuffer(StreamBuffer &&);\n> > + StreamBuffer &operator=(StreamBuffer &&);\n> > +\n> > + CameraStream *stream;\n> > + buffer_handle_t *camera3Buffer;\n> > + std::unique_ptr frameBuffer;\n> > + libcamera::UniqueFD fence;\n> > + Status status = Status::Success;\n> > + libcamera::FrameBuffer *internalBuffer = nullptr;\n> > + const libcamera::FrameBuffer *srcBuffer = nullptr;\n> > + std::unique_ptr dstBuffer;\n> > + Camera3RequestDescriptor *request;\n> > +\n> > +private:\n> > + LIBCAMERA_DISABLE_COPY(StreamBuffer)\n> > +};\n> > +\n> > +class Camera3RequestDescriptor\n> > +{\n> > +public:\n> > + enum class Status {\n> > + Success,\n> > + Error,\n> > };\n> >\n> > /* Keeps track of streams requiring post-processing. */\n> > diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n> > index 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> > worker_ = std::make_unique(postProcessor_.get());\n> > postProcessor_->processComplete.connect(\n> > - this, [&](Camera3RequestDescriptor::StreamBuffer *streamBuffer,\n> > + this, [&](StreamBuffer *streamBuffer,\n> > PostProcessor::Status status) {\n> > - Camera3RequestDescriptor::Status bufferStatus;\n> > + StreamBuffer::Status bufferStatus;\n> >\n> > if (status == PostProcessor::Status::Success)\n> > - bufferStatus = Camera3RequestDescriptor::Status::Success;\n> > + bufferStatus = StreamBuffer::Status::Success;\n> > else\n> > - bufferStatus = Camera3RequestDescriptor::Status::Error;\n> > + bufferStatus = StreamBuffer::Status::Error;\n> >\n> > cameraDevice_->streamProcessingComplete(streamBuffer,\n> > bufferStatus);\n> > @@ -165,7 +165,7 @@ int CameraStream::waitFence(int fence)\n> > return -errno;\n> > }\n> >\n> > -int CameraStream::process(Camera3RequestDescriptor::StreamBuffer *streamBuffer)\n> > +int CameraStream::process(StreamBuffer *streamBuffer)\n> > {\n> > ASSERT(type_ != Type::Direct);\n> >\n> > @@ -283,7 +283,7 @@ void CameraStream::PostProcessorWorker::start()\n> > Thread::start();\n> > }\n> >\n> > -void CameraStream::PostProcessorWorker::queueRequest(Camera3RequestDescriptor::StreamBuffer *dest)\n> > +void CameraStream::PostProcessorWorker::queueRequest(StreamBuffer *dest)\n> > {\n> > {\n> > MutexLocker lock(mutex_);\n> > @@ -306,7 +306,7 @@ void CameraStream::PostProcessorWorker::run()\n> > if (state_ != State::Running)\n> > break;\n> >\n> > - Camera3RequestDescriptor::StreamBuffer *streamBuffer = requests_.front();\n> > + StreamBuffer *streamBuffer = requests_.front();\n> > requests_.pop();\n> > locker.unlock();\n> >\n> > @@ -316,7 +316,7 @@ void CameraStream::PostProcessorWorker::run()\n> > }\n> >\n> > if (state_ == State::Flushing) {\n> > - std::queue requests =\n> > + std::queue requests =\n> > std::move(requests_);\n> > locker.unlock();\n> >\n> > diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> > index 395552dac..30f64f690 100644\n> > --- a/src/android/camera_stream.h\n> > +++ b/src/android/camera_stream.h\n> > @@ -127,7 +127,7 @@ public:\n> > CameraStream *sourceStream() const { return sourceStream_; }\n> >\n> > int configure();\n> > - int process(Camera3RequestDescriptor::StreamBuffer *streamBuffer);\n> > + int process(StreamBuffer *streamBuffer);\n> > libcamera::FrameBuffer *getBuffer();\n> > void putBuffer(libcamera::FrameBuffer *buffer);\n> > void flush();\n> > @@ -146,7 +146,7 @@ private:\n> > ~PostProcessorWorker();\n> >\n> > void start();\n> > - void queueRequest(Camera3RequestDescriptor::StreamBuffer *request);\n> > + void queueRequest(StreamBuffer *request);\n> > void flush();\n> >\n> > protected:\n> > @@ -158,7 +158,7 @@ private:\n> > libcamera::Mutex mutex_;\n> > libcamera::ConditionVariable cv_;\n> >\n> > - std::queue requests_\n> > + std::queue requests_\n> > LIBCAMERA_TSA_GUARDED_BY(mutex_);\n> >\n> > State state_ LIBCAMERA_TSA_GUARDED_BY(mutex_) = State::Stopped;\n> > diff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h\n> > index ed033c191..25425d92c 100644\n> > --- a/src/android/jpeg/encoder.h\n> > +++ b/src/android/jpeg/encoder.h\n> > @@ -20,7 +20,7 @@ public:\n> > virtual ~Encoder() = default;\n> >\n> > virtual int configure(const libcamera::StreamConfiguration &cfg) = 0;\n> > - virtual int encode(Camera3RequestDescriptor::StreamBuffer *buffer,\n> > + virtual int encode(StreamBuffer *buffer,\n> > libcamera::Span exifData,\n> > unsigned int quality) = 0;\n> > };\n> > diff --git a/src/android/jpeg/encoder_jea.cpp b/src/android/jpeg/encoder_jea.cpp\n> > index 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> > return 0;\n> > }\n> >\n> > -int EncoderJea::encode(Camera3RequestDescriptor::StreamBuffer *buffer,\n> > +int EncoderJea::encode(StreamBuffer *buffer,\n> > libcamera::Span exifData,\n> > unsigned int quality)\n> > {\n> > diff --git a/src/android/jpeg/encoder_jea.h b/src/android/jpeg/encoder_jea.h\n> > index 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> > ~EncoderJea();\n> >\n> > int configure(const libcamera::StreamConfiguration &cfg) override;\n> > - int encode(Camera3RequestDescriptor::StreamBuffer *buffer,\n> > + int encode(StreamBuffer *buffer,\n> > libcamera::Span exifData,\n> > unsigned int quality) override;\n> >\n> > diff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp\n> > index 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> > }\n> > }\n> >\n> > -int EncoderLibJpeg::encode(Camera3RequestDescriptor::StreamBuffer *buffer,\n> > +int EncoderLibJpeg::encode(StreamBuffer *buffer,\n> > libcamera::Span exifData,\n> > unsigned int quality)\n> > {\n> > diff --git a/src/android/jpeg/encoder_libjpeg.h b/src/android/jpeg/encoder_libjpeg.h\n> > index 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> > ~EncoderLibJpeg();\n> >\n> > int configure(const libcamera::StreamConfiguration &cfg) override;\n> > - int encode(Camera3RequestDescriptor::StreamBuffer *buffer,\n> > + int encode(StreamBuffer *buffer,\n> > libcamera::Span exifData,\n> > unsigned int quality) override;\n> > int encode(const std::vector> &planes,\n> > diff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp\n> > index 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> > }\n> > }\n> >\n> > -void PostProcessorJpeg::process(Camera3RequestDescriptor::StreamBuffer *streamBuffer)\n> > +void PostProcessorJpeg::process(StreamBuffer *streamBuffer)\n> > {\n> > ASSERT(encoder_);\n> >\n> > diff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h\n> > index 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> > int configure(const libcamera::StreamConfiguration &incfg,\n> > const libcamera::StreamConfiguration &outcfg) override;\n> > - void process(Camera3RequestDescriptor::StreamBuffer *streamBuffer) override;\n> > + void process(StreamBuffer *streamBuffer) override;\n> >\n> > private:\n> > void generateThumbnail(const libcamera::FrameBuffer &source,\n> > diff --git a/src/android/post_processor.h b/src/android/post_processor.h\n> > index 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> > virtual int configure(const libcamera::StreamConfiguration &inCfg,\n> > const libcamera::StreamConfiguration &outCfg) = 0;\n> > - virtual void process(Camera3RequestDescriptor::StreamBuffer *streamBuffer) = 0;\n> > + virtual void process(StreamBuffer *streamBuffer) = 0;\n> >\n> > - libcamera::Signal processComplete;\n> > + libcamera::Signal processComplete;\n> > };\n> > diff --git a/src/android/yuv/post_processor_yuv.cpp b/src/android/yuv/post_processor_yuv.cpp\n> > index 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> > return 0;\n> > }\n> >\n> > -void PostProcessorYuv::process(Camera3RequestDescriptor::StreamBuffer *streamBuffer)\n> > +void PostProcessorYuv::process(StreamBuffer *streamBuffer)\n> > {\n> > const FrameBuffer &source = *streamBuffer->srcBuffer;\n> > CameraBuffer *destination = streamBuffer->dstBuffer.get();\n> > diff --git a/src/android/yuv/post_processor_yuv.h b/src/android/yuv/post_processor_yuv.h\n> > index 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> > int configure(const libcamera::StreamConfiguration &incfg,\n> > const libcamera::StreamConfiguration &outcfg) override;\n> > - void process(Camera3RequestDescriptor::StreamBuffer *streamBuffer) override;\n> > + void process(StreamBuffer *streamBuffer) override;\n> >\n> > private:\n> > bool isValidBuffers(const libcamera::FrameBuffer &source,\n> > --\n> > 2.47.0.338.g60cca15819-goog\n> >","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 2EEABC3220\n\tfor ;\n\tFri, 29 Nov 2024 07:07:08 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 36B5765FF5;\n\tFri, 29 Nov 2024 08:07:07 +0100 (CET)","from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com\n\t[IPv6:2a00:1450:4864:20::22e])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7540C60CE6\n\tfor ;\n\tFri, 29 Nov 2024 08:07:05 +0100 (CET)","by mail-lj1-x22e.google.com with SMTP id\n\t38308e7fff4ca-2ffc1009a06so24097021fa.2\n\tfor ;\n\tThu, 28 Nov 2024 23:07:05 -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=\"LMfYIORO\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1732864025; x=1733468825;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:cc:to:subject:message-id:date:from\n\t:in-reply-to:references:mime-version:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=zChUno/sQHtfw8noNVQgRgBiUToNxbuaaHlEi/p7zb8=;\n\tb=LMfYIOROtaiP/47Qq17sfVdr4lmUl+lnX0ZEieyF6sRuc1Frm+vPE/zEd8ghIhu4Tj\n\t+AsrQ21WfOoURLvGpf/FJuB7QIg02+Fiq4qn5WICs69oz/w0KTRELddbkIxzUVqjK3K7\n\tIF0M/A2e5kw6Ao56fH+Y/+DFUWlQP0ibbghCQ=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1732864025; x=1733468825;\n\th=content-transfer-encoding:cc:to:subject:message-id:date:from\n\t:in-reply-to:references:mime-version:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=zChUno/sQHtfw8noNVQgRgBiUToNxbuaaHlEi/p7zb8=;\n\tb=H7AKl/EwyseoAdO3KexCR5dR9A/CIlFdRa9AFmuriSGSh27F8qfSm3WAAhxi2luYx6\n\tM2wO65o5H4RGZ2EyPv06AV113RvNoaMWXolhaHREtabJGRa6cdDJhpq5aQmzAuwnSzal\n\tqb80teUMUMoIeKS96U7FGaN1KdPHchvBgS0Eo647NWFLDtDKX8fc4emjrOM4XevMHx8Q\n\t+gr1TwgKpozU/RtifXTWX8Vv3AWsumSp9WHvFxoI+3JntX08smZsOXVfxgV+BdCElJkM\n\tJpYXJPPMoiNm1mcIfMpI+RjYMdgCzOS58I49qqhEaLUli5R0icaJJO+vS1guje3cSgpd\n\tXC5g==","X-Gm-Message-State":"AOJu0Yzo8XhBlJnC0NCTEOlKzorhtAP904IJy8rF6bV6E5Ia+BrL386T\n\tSxJifV7qLwalIjNWF/i1HHHKw0O26o1+jdPE7zzIAh9QGYHlqUuUWM1QuuB053aVIEoGgKldm2Y\n\twhXeQ+2+6Yx+J6u17RagtTr9FL2X91GJS9uST","X-Gm-Gg":"ASbGncvI+DKlEEAr0yq8EQNXWdOEaLaf9ko9J78sDxpD5S4+n+u1twwVVtYSDHhwH9B\n\tF4cUHgdt+2seu4DDItchs0nOnoEbzAS5qJH4peuOQQfndnVKL87RXGCkq47Y=","X-Google-Smtp-Source":"AGHT+IGyPn4RGLODfv/cmJnTTLHtZDBbNIzvL31BceNBnZtpV3wqHLn0XKDuv6ldwB6vRJVIjxuxJ480zB7VzbFex6c=","X-Received":"by 2002:a2e:bd06:0:b0:2fb:36df:3b4 with SMTP id\n\t38308e7fff4ca-2ffd60d2067mr100955161fa.34.1732864024519;\n\tThu, 28 Nov 2024 23:07:04 -0800 (PST)","MIME-Version":"1.0","References":"<20241127092632.3145984-1-chenghaoyang@chromium.org>\n\t<20241127092632.3145984-3-chenghaoyang@chromium.org>\n\t","In-Reply-To":"","From":"Cheng-Hao Yang ","Date":"Fri, 29 Nov 2024 15:06:53 +0800","Message-ID":"","Subject":"Re: [PATCH v2 2/9] android: Move StreamBuffer out of\n\tCamera3RequestDescriptor","To":"Jacopo Mondi ","Cc":"libcamera-devel@lists.libcamera.org, \n\tHan-Lin Chen ","Content-Type":"text/plain; charset=\"UTF-8\"","Content-Transfer-Encoding":"quoted-printable","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\" "}}]