<div dir="ltr"><div dir="ltr">Hi Jean-Michel,<div><br></div><div>Thank you for your work.</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, 23 Mar 2022 at 16:01, Jean-Michel Hautbois via libcamera-devel <<a href="mailto:libcamera-devel@lists.libcamera.org">libcamera-devel@lists.libcamera.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Simplify name-spacing of the RPi components by placing it in the<br>
ipa::RPi namespace directly. It also aligns the RPi IPA with the other<br>
ones (ipa::ipu3 and ipa::rkisp1) which already have this applied.<br>
<br>
Signed-off-by: Jean-Michel Hautbois <<a href="mailto:jeanmichel.hautbois@ideasonboard.com" target="_blank">jeanmichel.hautbois@ideasonboard.com</a>><br></blockquote><div><br></div><div>Looks good to me.</div><div><br></div><div>Reviewed-by: Naushir Patuck <<a href="mailto:naush@raspberrypi.com">naush@raspberrypi.com</a>></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
---<br>
src/ipa/raspberrypi/raspberrypi.cpp | 42 ++++++++++++++++-------------<br>
1 file changed, 23 insertions(+), 19 deletions(-)<br>
<br>
diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp<br>
index 1bf4e270..cf4e6cab 100644<br>
--- a/src/ipa/raspberrypi/raspberrypi.cpp<br>
+++ b/src/ipa/raspberrypi/raspberrypi.cpp<br>
@@ -74,7 +74,9 @@ constexpr Duration controllerMinFrameDuration = 1.0s / 30.0;<br>
<br>
LOG_DEFINE_CATEGORY(IPARPI)<br>
<br>
-class IPARPi : public ipa::RPi::IPARPiInterface<br>
+namespace ipa::RPi {<br>
+<br>
+class IPARPi : public IPARPiInterface<br>
{<br>
public:<br>
IPARPi()<br>
@@ -86,23 +88,23 @@ public:<br>
~IPARPi()<br>
{<br>
if (lsTable_)<br>
- munmap(lsTable_, ipa::RPi::MaxLsGridSize);<br>
+ munmap(lsTable_, MaxLsGridSize);<br>
}<br>
<br>
- int init(const IPASettings &settings, ipa::RPi::SensorConfig *sensorConfig) override;<br>
- void start(const ControlList &controls, ipa::RPi::StartConfig *startConfig) override;<br>
+ int init(const IPASettings &settings, SensorConfig *sensorConfig) override;<br>
+ void start(const ControlList &controls, StartConfig *startConfig) override;<br>
void stop() override {}<br>
<br>
int configure(const IPACameraSensorInfo &sensorInfo,<br>
const std::map<unsigned int, IPAStream> &streamConfig,<br>
const std::map<unsigned int, ControlInfoMap> &entityControls,<br>
- const ipa::RPi::IPAConfig &data,<br>
+ const IPAConfig &data,<br>
ControlList *controls) override;<br>
void mapBuffers(const std::vector<IPABuffer> &buffers) override;<br>
void unmapBuffers(const std::vector<unsigned int> &ids) override;<br>
void signalStatReady(const uint32_t bufferId) override;<br>
void signalQueueRequest(const ControlList &controls) override;<br>
- void signalIspPrepare(const ipa::RPi::ISPConfig &data) override;<br>
+ void signalIspPrepare(const ISPConfig &data) override;<br>
<br>
private:<br>
void setMode(const IPACameraSensorInfo &sensorInfo);<br>
@@ -110,7 +112,7 @@ private:<br>
bool validateIspControls();<br>
void queueRequest(const ControlList &controls);<br>
void returnEmbeddedBuffer(unsigned int bufferId);<br>
- void prepareISP(const ipa::RPi::ISPConfig &data);<br>
+ void prepareISP(const ISPConfig &data);<br>
void reportMetadata();<br>
void fillDeviceStatus(const ControlList &sensorControls);<br>
void processStats(unsigned int bufferId);<br>
@@ -178,7 +180,7 @@ private:<br>
uint32_t maxSensorGainCode_;<br>
};<br>
<br>
-int IPARPi::init(const IPASettings &settings, ipa::RPi::SensorConfig *sensorConfig)<br>
+int IPARPi::init(const IPASettings &settings, SensorConfig *sensorConfig)<br>
{<br>
/*<br>
* Load the "helper" for this sensor. This tells us all the device specific stuff<br>
@@ -212,7 +214,7 @@ int IPARPi::init(const IPASettings &settings, ipa::RPi::SensorConfig *sensorConf<br>
return 0;<br>
}<br>
<br>
-void IPARPi::start(const ControlList &controls, ipa::RPi::StartConfig *startConfig)<br>
+void IPARPi::start(const ControlList &controls, StartConfig *startConfig)<br>
{<br>
RPiController::Metadata metadata;<br>
<br>
@@ -339,7 +341,7 @@ void IPARPi::setMode(const IPACameraSensorInfo &sensorInfo)<br>
int IPARPi::configure(const IPACameraSensorInfo &sensorInfo,<br>
[[maybe_unused]] const std::map<unsigned int, IPAStream> &streamConfig,<br>
const std::map<unsigned int, ControlInfoMap> &entityControls,<br>
- const ipa::RPi::IPAConfig &ipaConfig,<br>
+ const IPAConfig &ipaConfig,<br>
ControlList *controls)<br>
{<br>
if (entityControls.size() != 2) {<br>
@@ -374,14 +376,14 @@ int IPARPi::configure(const IPACameraSensorInfo &sensorInfo,<br>
if (ipaConfig.lsTableHandle.isValid()) {<br>
/* Remove any previous table, if there was one. */<br>
if (lsTable_) {<br>
- munmap(lsTable_, ipa::RPi::MaxLsGridSize);<br>
+ munmap(lsTable_, MaxLsGridSize);<br>
lsTable_ = nullptr;<br>
}<br>
<br>
/* Map the LS table buffer into user space. */<br>
lsTableHandle_ = std::move(ipaConfig.lsTableHandle);<br>
if (lsTableHandle_.isValid()) {<br>
- lsTable_ = mmap(nullptr, ipa::RPi::MaxLsGridSize, PROT_READ | PROT_WRITE,<br>
+ lsTable_ = mmap(nullptr, MaxLsGridSize, PROT_READ | PROT_WRITE,<br>
MAP_SHARED, lsTableHandle_.get(), 0);<br>
<br>
if (lsTable_ == MAP_FAILED) {<br>
@@ -446,7 +448,7 @@ void IPARPi::signalStatReady(uint32_t bufferId)<br>
<br>
reportMetadata();<br>
<br>
- statsMetadataComplete.emit(bufferId & ipa::RPi::MaskID, libcameraMetadata_);<br>
+ statsMetadataComplete.emit(bufferId & MaskID, libcameraMetadata_);<br>
}<br>
<br>
void IPARPi::signalQueueRequest(const ControlList &controls)<br>
@@ -454,7 +456,7 @@ void IPARPi::signalQueueRequest(const ControlList &controls)<br>
queueRequest(controls);<br>
}<br>
<br>
-void IPARPi::signalIspPrepare(const ipa::RPi::ISPConfig &data)<br>
+void IPARPi::signalIspPrepare(const ISPConfig &data)<br>
{<br>
/*<br>
* At start-up, or after a mode-switch, we may want to<br>
@@ -465,7 +467,7 @@ void IPARPi::signalIspPrepare(const ipa::RPi::ISPConfig &data)<br>
frameCount_++;<br>
<br>
/* Ready to push the input buffer into the ISP. */<br>
- runIsp.emit(data.bayerBufferId & ipa::RPi::MaskID);<br>
+ runIsp.emit(data.bayerBufferId & MaskID);<br>
}<br>
<br>
void IPARPi::reportMetadata()<br>
@@ -927,10 +929,10 @@ void IPARPi::queueRequest(const ControlList &controls)<br>
<br>
void IPARPi::returnEmbeddedBuffer(unsigned int bufferId)<br>
{<br>
- embeddedComplete.emit(bufferId & ipa::RPi::MaskID);<br>
+ embeddedComplete.emit(bufferId & MaskID);<br>
}<br>
<br>
-void IPARPi::prepareISP(const ipa::RPi::ISPConfig &data)<br>
+void IPARPi::prepareISP(const ISPConfig &data)<br>
{<br>
int64_t frameTimestamp = data.controls.get(controls::SensorTimestamp);<br>
RPiController::Metadata lastMetadata;<br>
@@ -1316,7 +1318,7 @@ void IPARPi::applyLS(const struct AlscStatus *lsStatus, ControlList &ctrls)<br>
.gain_format = GAIN_FORMAT_U4P10<br>
};<br>
<br>
- if (!lsTable_ || w * h * 4 * sizeof(uint16_t) > ipa::RPi::MaxLsGridSize) {<br>
+ if (!lsTable_ || w * h * 4 * sizeof(uint16_t) > MaxLsGridSize) {<br>
LOG(IPARPI, Error) << "Do not have a correctly allocate lens shading table!";<br>
return;<br>
}<br>
@@ -1376,6 +1378,8 @@ void IPARPi::resampleTable(uint16_t dest[], double const src[12][16],<br>
}<br>
}<br>
<br>
+} /* namespace ipa::RPi */<br>
+<br>
/*<br>
* External IPA module interface<br>
*/<br>
@@ -1389,7 +1393,7 @@ const struct IPAModuleInfo ipaModuleInfo = {<br>
<br>
IPAInterface *ipaCreate()<br>
{<br>
- return new IPARPi();<br>
+ return new ipa::RPi::IPARPi();<br>
}<br>
<br>
} /* extern "C" */<br>
-- <br>
2.32.0<br>
<br>
</blockquote></div></div>