PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: Switch to FrameBuffer interface

Browse Source 
Switch to the FrameBuffer interface where all buffers are treated as
external buffers and are allocated outside the camera. Applications
allocating buffers using libcamera are switched to use the
FrameBufferAllocator helper.

Follow-up changes to this one will finalize the transition to the new
FrameBuffer interface by removing code that is left unused after this
change.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Niklas Söderlund
2019-11-22 16:22:56 +01:00
parent eb4030f6c0
commit 9217f274f6
23 changed files with 267 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/camera/buffer_import.cpp
View File

@@ -120,7 +120,7 @@ public:
}
protected:
void bufferComplete(Request *request, Buffer *buffer)
void bufferComplete(Request *request, FrameBuffer *buffer)
{
if (buffer->metadata().status != FrameMetadata::FrameSuccess)
return;
@@ -133,17 +133,16 @@ protected:
if (request->status() != Request::RequestComplete)
return;
const std::map<Stream *, Buffer *> &buffers = request->buffers();
const std::map<Stream *, FrameBuffer *> &buffers = request->buffers();
completeRequestsCount_++;
/* Create a new request. */
Stream *stream = buffers.begin()->first;
int dmabuf = buffers.begin()->second->dmabufs()[0];
std::unique_ptr<Buffer> buffer = stream->createBuffer({ dmabuf, -1, -1 });
FrameBuffer *buffer = buffers.begin()->second;
request = camera_->createRequest();
request->addBuffer(stream, std::move(buffer));
request->addBuffer(stream, buffer);
camera_->queueRequest(request);
}
@@ -158,9 +157,6 @@ protected:
return TestFail;
}
StreamConfiguration &cfg = config_->at(0);
cfg.memoryType = ExternalMemory;
return TestPass;
}
@@ -191,17 +187,14 @@ protected:
return TestFail;
std::vector<Request *> requests;
for (const std::unique_ptr<FrameBuffer> &framebuffer : source.buffers()) {
int dmabuf = framebuffer->planes()[0].fd.fd();
for (const std::unique_ptr<FrameBuffer> &buffer : source.buffers()) {
Request *request = camera_->createRequest();
if (!request) {
std::cout << "Failed to create request" << std::endl;
return TestFail;
}
std::unique_ptr<Buffer> buffer = stream->createBuffer({ dmabuf, -1, -1 });
if (request->addBuffer(stream, std::move(buffer))) {
if (request->addBuffer(stream, buffer.get())) {
std::cout << "Failed to associating buffer with request" << std::endl;
return TestFail;
}