summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/libcamera/buffer.h1
-rw-r--r--src/libcamera/request.cpp9
2 files changed, 5 insertions, 5 deletions
diff --git a/include/libcamera/buffer.h b/include/libcamera/buffer.h
index 302fe3d3..620f8a66 100644
--- a/include/libcamera/buffer.h
+++ b/include/libcamera/buffer.h
@@ -56,7 +56,6 @@ public:
private:
LIBCAMERA_DISABLE_COPY_AND_MOVE(FrameBuffer)
- friend class Request; /* Needed to update request_. */
friend class V4L2VideoDevice; /* Needed to update metadata_. */
std::vector<Plane> planes_;
diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp
index 0071667e..3ad83f3b 100644
--- a/src/libcamera/request.cpp
+++ b/src/libcamera/request.cpp
@@ -118,8 +118,9 @@ void Request::reuse(ReuseFlag flags)
pending_.clear();
if (flags & ReuseBuffers) {
for (auto pair : bufferMap_) {
- pair.second->request_ = this;
- pending_.insert(pair.second);
+ FrameBuffer *buffer = pair.second;
+ buffer->setRequest(this);
+ pending_.insert(buffer);
}
} else {
bufferMap_.clear();
@@ -187,7 +188,7 @@ int Request::addBuffer(const Stream *stream, FrameBuffer *buffer)
return -EEXIST;
}
- buffer->request_ = this;
+ buffer->setRequest(this);
pending_.insert(buffer);
bufferMap_[stream] = buffer;
@@ -294,7 +295,7 @@ bool Request::completeBuffer(FrameBuffer *buffer)
int ret = pending_.erase(buffer);
ASSERT(ret == 1);
- buffer->request_ = nullptr;
+ buffer->setRequest(nullptr);
if (buffer->metadata().status == FrameMetadata::FrameCancelled)
cancelled_ = true;