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

ipa: raspberrypi: Use MappedFrameBuffer for the IPA buffers

Browse source 
Instead of directly mmaping/unmapping buffers passed to the IPA, use
a MappedFrameBuffer. The latter is a cleaner interface, and avoid
code duplication.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Naushir Patuck 2020-11-16 14:37:57 +00:00 • committed by Kieran Bingham
parent 6f51e39d78
commit 6a2dfc2609
1 changed files with 15 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/ipa/raspberrypi/raspberrypi.cpp
View file

@ -24,6 +24,7 @@
#include <libipa/ipa_interface_wrapper.h> #include <libipa/ipa_interface_wrapper.h>
#include "libcamera/internal/buffer.h"
#include "libcamera/internal/camera_sensor.h" #include "libcamera/internal/camera_sensor.h"
#include "libcamera/internal/log.h" #include "libcamera/internal/log.h"
#include "libcamera/internal/utils.h" #include "libcamera/internal/utils.h"
@ -110,8 +111,7 @@ private:
void applyLS(const struct AlscStatus *lsStatus, ControlList &ctrls); void applyLS(const struct AlscStatus *lsStatus, ControlList &ctrls);
void resampleTable(uint16_t dest[], double const src[12][16], int destW, int destH); void resampleTable(uint16_t dest[], double const src[12][16], int destW, int destH);
std::map<unsigned int, FrameBuffer> buffers_; std::map<unsigned int, MappedFrameBuffer> buffers_;
std::map<unsigned int, void *> buffersMemory_;
ControlInfoMap unicamCtrls_; ControlInfoMap unicamCtrls_;
ControlInfoMap ispCtrls_; ControlInfoMap ispCtrls_;
@ -319,31 +319,18 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,
void IPARPi::mapBuffers(const std::vector<IPABuffer> &buffers) void IPARPi::mapBuffers(const std::vector<IPABuffer> &buffers)
{ {
for (const IPABuffer &buffer : buffers) { for (const IPABuffer &buffer : buffers) {
auto elem = buffers_.emplace(std::piecewise_construct, const FrameBuffer fb(buffer.planes);
std::forward_as_tuple(buffer.id), buffers_.emplace(buffer.id, MappedFrameBuffer(&fb, PROT_READ | PROT_WRITE));
std::forward_as_tuple(buffer.planes));
const FrameBuffer &fb = elem.first->second;
buffersMemory_[buffer.id] = mmap(nullptr, fb.planes()[0].length,
PROT_READ | PROT_WRITE, MAP_SHARED,
fb.planes()[0].fd.fd(), 0);
if (buffersMemory_[buffer.id] == MAP_FAILED) {
int ret = -errno;
LOG(IPARPI, Fatal) << "Failed to mmap buffer: " << strerror(-ret);
}
} }
} }
void IPARPi::unmapBuffers(const std::vector<unsigned int> &ids) void IPARPi::unmapBuffers(const std::vector<unsigned int> &ids)
{ {
for (unsigned int id : ids) { for (unsigned int id : ids) {
const auto fb = buffers_.find(id); auto it = buffers_.find(id);
if (fb == buffers_.end()) if (it == buffers_.end())
continue; continue;
munmap(buffersMemory_[id], fb->second.planes()[0].length);
buffersMemory_.erase(id);
buffers_.erase(id); buffers_.erase(id);
} }
} }
@ -790,15 +777,15 @@ void IPARPi::prepareISP(unsigned int bufferId)
bool IPARPi::parseEmbeddedData(unsigned int bufferId, struct DeviceStatus &deviceStatus) bool IPARPi::parseEmbeddedData(unsigned int bufferId, struct DeviceStatus &deviceStatus)
{ {
auto it = buffersMemory_.find(bufferId); auto it = buffers_.find(bufferId);
if (it == buffersMemory_.end()) { if (it == buffers_.end()) {
LOG(IPARPI, Error) << "Could not find embedded buffer!"; LOG(IPARPI, Error) << "Could not find embedded buffer!";
return false; return false;
} }
int size = buffers_.find(bufferId)->second.planes()[0].length; Span<uint8_t> mem = it->second.maps()[0];
helper_->Parser().SetBufferSize(size); helper_->Parser().SetBufferSize(mem.size());
RPiController::MdParser::Status status = helper_->Parser().Parse(it->second); RPiController::MdParser::Status status = helper_->Parser().Parse(mem.data());
if (status != RPiController::MdParser::Status::OK) { if (status != RPiController::MdParser::Status::OK) {
LOG(IPARPI, Error) << "Embedded Buffer parsing failed, error " << status; LOG(IPARPI, Error) << "Embedded Buffer parsing failed, error " << status;
} else { } else {
@ -825,13 +812,14 @@ bool IPARPi::parseEmbeddedData(unsigned int bufferId, struct DeviceStatus &devic
void IPARPi::processStats(unsigned int bufferId) void IPARPi::processStats(unsigned int bufferId)
{ {
auto it = buffersMemory_.find(bufferId); auto it = buffers_.find(bufferId);
if (it == buffersMemory_.end()) { if (it == buffers_.end()) {
LOG(IPARPI, Error) << "Could not find stats buffer!"; LOG(IPARPI, Error) << "Could not find stats buffer!";
return; return;
} }
bcm2835_isp_stats *stats = static_cast<bcm2835_isp_stats *>(it->second); Span<uint8_t> mem = it->second.maps()[0];
bcm2835_isp_stats *stats = reinterpret_cast<bcm2835_isp_stats *>(mem.data());
RPiController::StatisticsPtr statistics = std::make_shared<bcm2835_isp_stats>(*stats); RPiController::StatisticsPtr statistics = std::make_shared<bcm2835_isp_stats>(*stats);
controller_.Process(statistics, &rpiMetadata_); controller_.Process(statistics, &rpiMetadata_);