From 6084217cd3b52ba5677e3ca2de0e21008fdaa735 Mon Sep 17 00:00:00 2001
From: Kieran Bingham <kieran.bingham@ideasonboard.com>
Date: Thu, 11 Mar 2021 12:51:45 +0000
Subject: libcamera: pipeline: ipu3: frames: Use the request sequence

For all frame indexes, use the same sequence number as generated
by the Request object.

This allows clear matching of what operations occurred to which request.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/libcamera/pipeline/ipu3/frames.cpp | 4 +---
 src/libcamera/pipeline/ipu3/frames.h   | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/libcamera/pipeline/ipu3/frames.cpp b/src/libcamera/pipeline/ipu3/frames.cpp
index e8eb1c51..03e8131c 100644
--- a/src/libcamera/pipeline/ipu3/frames.cpp
+++ b/src/libcamera/pipeline/ipu3/frames.cpp
@@ -18,7 +18,6 @@ namespace libcamera {
 LOG_DECLARE_CATEGORY(IPU3)
 
 IPU3Frames::IPU3Frames()
-	: nextId_(0)
 {
 }
 
@@ -31,7 +30,6 @@ void IPU3Frames::init(const std::vector<std::unique_ptr<FrameBuffer>> &paramBuff
 	for (const std::unique_ptr<FrameBuffer> &buffer : statBuffers)
 		availableStatBuffers_.push(buffer.get());
 
-	nextId_ = 0;
 	frameInfo_.clear();
 }
 
@@ -43,7 +41,7 @@ void IPU3Frames::clear()
 
 IPU3Frames::Info *IPU3Frames::create(Request *request)
 {
-	unsigned int id = nextId_++;
+	unsigned int id = request->sequence();
 
 	if (availableParamBuffers_.empty()) {
 		LOG(IPU3, Error) << "Parameters buffer underrun";
diff --git a/src/libcamera/pipeline/ipu3/frames.h b/src/libcamera/pipeline/ipu3/frames.h
index 106e5c15..4acdf48e 100644
--- a/src/libcamera/pipeline/ipu3/frames.h
+++ b/src/libcamera/pipeline/ipu3/frames.h
@@ -53,7 +53,6 @@ private:
 	std::queue<FrameBuffer *> availableParamBuffers_;
 	std::queue<FrameBuffer *> availableStatBuffers_;
 
-	unsigned int nextId_;
 	std::map<unsigned int, std::unique_ptr<Info>> frameInfo_;
 };
 
-- 
cgit v1.2.1