[libcamera-devel] [RFC PATCH v3 3/3] libcamera: ipu3: Cancel pending requests correctly

[Hirokazu Honda]

IPU3CameraData stores requests that are not queued yet to a
camera node. They should be reported as cancel upon
PipelineHandlerIPU3::stop().

Signed-off-by: Hirokazu Honda <hiroh at chromium.org>
---
 include/libcamera/buffer.h           |  3 +++
 src/libcamera/pipeline/ipu3/ipu3.cpp | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/include/libcamera/buffer.h b/include/libcamera/buffer.h
index 620f8a66..72c62144 100644
--- a/include/libcamera/buffer.h
+++ b/include/libcamera/buffer.h
@@ -58,6 +58,9 @@ private:
 
 	friend class V4L2VideoDevice; /* Needed to update metadata_. */
 
+	/*! HACK! */
+	friend class IPU3CameraData; /* Needed to update metadata_. */
+
 	std::vector<Plane> planes_;
 
 	Request *request_;
diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
index 462a0d9b..f89b8f3f 100644
--- a/src/libcamera/pipeline/ipu3/ipu3.cpp
+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
@@ -66,6 +66,7 @@ public:
 	void cio2BufferReady(FrameBuffer *buffer);
 	void paramBufferReady(FrameBuffer *buffer);
 	void statBufferReady(FrameBuffer *buffer);
+	void cancelPendingRequests();
 	int queuePendingRequests();
 
 	CIO2Device cio2_;
@@ -768,7 +769,7 @@ void PipelineHandlerIPU3::stop(Camera *camera)
 	IPU3CameraData *data = cameraData(camera);
 	int ret = 0;
 
-	data->pendingRequests_ = {};
+	data->cancelPendingRequests();
 
 	data->ipa_->stop();
 
@@ -780,6 +781,22 @@ void PipelineHandlerIPU3::stop(Camera *camera)
 	freeBuffers(camera);
 }
 
+void IPU3CameraData::cancelPendingRequests()
+{
+	while (!pendingRequests_.empty()) {
+		Request *request = pendingRequests_.front();
+
+		for (auto it : request->buffers()) {
+			FrameBuffer *buffer = it.second;
+			buffer->metadata_.status = FrameMetadata::FrameCancelled;
+			pipe_->completeBuffer(request, buffer);
+		}
+
+		pipe_->completeRequest(request);
+		pendingRequests_.pop();
+	}
+}
+
 int IPU3CameraData::queuePendingRequests()
 {
 	while (!pendingRequests_.empty()) {
-- 
2.31.0.208.g409f899ff0-goog