Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-19 18:35:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

qcam: Replace MappedBuffer with Span<uint8_t>

Browse source 
The MappedBuffer structure is a custom container that binds a data
pointer with a length. This is exactly what Span is. Use it instead.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2021-08-18 03:21:06 +03:00
parent 93802f600c
commit 6f09680b25
7 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/qcam/main_window.cpp
View file

@ -474,7 +474,8 @@ int MainWindow::startCapture()
const FrameBuffer::Plane &plane = buffer->planes().front();
void *memory = mmap(NULL, plane.length, PROT_READ, MAP_SHARED,
plane.fd.fd(), 0);
mappedBuffers_[buffer.get()] = { memory, plane.length };
mappedBuffers_[buffer.get()] = { static_cast<uint8_t *>(memory),
plane.length };
/* Store buffers on the free list. */
freeBuffers_[stream].enqueue(buffer.get());
@ -537,8 +538,8 @@ error:
requests_.clear();
for (auto &iter : mappedBuffers_) {
const MappedBuffer &buffer = iter.second;
munmap(buffer.memory, buffer.size);
const Span<uint8_t> &buffer = iter.second;
munmap(buffer.data(), buffer.size());
}
mappedBuffers_.clear();
@ -573,8 +574,8 @@ void MainWindow::stopCapture()
camera_->requestCompleted.disconnect(this, &MainWindow::requestComplete);
for (auto &iter : mappedBuffers_) {
const MappedBuffer &buffer = iter.second;
munmap(buffer.memory, buffer.size);
const Span<uint8_t> &buffer = iter.second;
munmap(buffer.data(), buffer.size());
}
mappedBuffers_.clear();
@ -673,10 +674,10 @@ void MainWindow::processRaw(FrameBuffer *buffer,
"DNG Files (*.dng)");
if (!filename.isEmpty()) {
const MappedBuffer &mapped = mappedBuffers_[buffer];
const Span<uint8_t> &mapped = mappedBuffers_[buffer];
DNGWriter::write(filename.toStdString().c_str(), camera_.get(),
rawStream_->configuration(), metadata, buffer,
mapped.memory);
mapped.data());
}
#endif
@ -753,7 +754,7 @@ void MainWindow::processViewfinder(FrameBuffer *buffer)
<< "fps:" << Qt::fixed << qSetRealNumberPrecision(2) << fps;
/* Render the frame on the viewfinder. */
viewfinder_->render(buffer, &mappedBuffers_[buffer]);
viewfinder_->render(buffer, mappedBuffers_[buffer]);
}
void MainWindow::queueRequest(FrameBuffer *buffer)