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

ipa: ipu3: Cache line duration at configure call

Browse source 
We use the line duration several times in the IPAIPU3. Instead of
recalculating it each time, cache the value as a utils::Duration.
ExposureTime and FrameDuration units are in micro-seconds, cast the
Duration accordingly.

As sensorInfo is no longer used in updateSessionConfiguration remove the
reference to it.

Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
This commit is contained in:
Jean-Michel Hautbois 2021-11-10 20:40:18 +01:00
parent 9bef4144c8
commit ca9adf6b92
1 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/ipa/ipu3/ipu3.cpp
View file

@ -148,8 +148,7 @@ private:
void updateControls(const IPACameraSensorInfo &sensorInfo, void updateControls(const IPACameraSensorInfo &sensorInfo,
const ControlInfoMap &sensorControls, const ControlInfoMap &sensorControls,
ControlInfoMap *ipaControls); ControlInfoMap *ipaControls);
void updateSessionConfiguration(const IPACameraSensorInfo &sensorInfo, void updateSessionConfiguration(const ControlInfoMap &sensorControls);
const ControlInfoMap &sensorControls);
void processControls(unsigned int frame, const ControlList &controls); void processControls(unsigned int frame, const ControlList &controls);
void fillParams(unsigned int frame, ipu3_uapi_params *params); void fillParams(unsigned int frame, ipu3_uapi_params *params);
void parseStatistics(unsigned int frame, void parseStatistics(unsigned int frame,
@ -174,6 +173,8 @@ private:
uint32_t minGain_; uint32_t minGain_;
uint32_t maxGain_; uint32_t maxGain_;
utils::Duration lineDuration_;
/* Interface to the Camera Helper */ /* Interface to the Camera Helper */
std::unique_ptr<CameraSensorHelper> camHelper_; std::unique_ptr<CameraSensorHelper> camHelper_;
@ -188,16 +189,12 @@ private:
* \brief Compute IPASessionConfiguration using the sensor information and the * \brief Compute IPASessionConfiguration using the sensor information and the
* sensor V4L2 controls * sensor V4L2 controls
*/ */
void IPAIPU3::updateSessionConfiguration(const IPACameraSensorInfo &sensorInfo, void IPAIPU3::updateSessionConfiguration(const ControlInfoMap &sensorControls)
const ControlInfoMap &sensorControls)
{ {
const ControlInfo &v4l2Exposure = sensorControls.find(V4L2_CID_EXPOSURE)->second; const ControlInfo &v4l2Exposure = sensorControls.find(V4L2_CID_EXPOSURE)->second;
int32_t minExposure = v4l2Exposure.min().get<int32_t>(); int32_t minExposure = v4l2Exposure.min().get<int32_t>();
int32_t maxExposure = v4l2Exposure.max().get<int32_t>(); int32_t maxExposure = v4l2Exposure.max().get<int32_t>();
utils::Duration lineDuration = sensorInfo.lineLength * 1.0s
/ sensorInfo.pixelRate;
const ControlInfo &v4l2Gain = sensorControls.find(V4L2_CID_ANALOGUE_GAIN)->second; const ControlInfo &v4l2Gain = sensorControls.find(V4L2_CID_ANALOGUE_GAIN)->second;
int32_t minGain = v4l2Gain.min().get<int32_t>(); int32_t minGain = v4l2Gain.min().get<int32_t>();
int32_t maxGain = v4l2Gain.max().get<int32_t>(); int32_t maxGain = v4l2Gain.max().get<int32_t>();
@ -209,8 +206,8 @@ void IPAIPU3::updateSessionConfiguration(const IPACameraSensorInfo &sensorInfo,
* *
* \todo take VBLANK into account for maximum shutter speed * \todo take VBLANK into account for maximum shutter speed
*/ */
context_.configuration.agc.minShutterSpeed = minExposure * lineDuration; context_.configuration.agc.minShutterSpeed = minExposure * lineDuration_;
context_.configuration.agc.maxShutterSpeed = maxExposure * lineDuration; context_.configuration.agc.maxShutterSpeed = maxExposure * lineDuration_;
context_.configuration.agc.minAnalogueGain = camHelper_->gain(minGain); context_.configuration.agc.minAnalogueGain = camHelper_->gain(minGain);
context_.configuration.agc.maxAnalogueGain = camHelper_->gain(maxGain); context_.configuration.agc.maxAnalogueGain = camHelper_->gain(maxGain);
} }
@ -239,11 +236,10 @@ void IPAIPU3::updateControls(const IPACameraSensorInfo &sensorInfo,
* exposure min, max and default and convert it from lines to * exposure min, max and default and convert it from lines to
* microseconds. * microseconds.
*/ */
double lineDuration = sensorInfo.lineLength / (sensorInfo.pixelRate / 1e6);
const ControlInfo &v4l2Exposure = sensorControls.find(V4L2_CID_EXPOSURE)->second; const ControlInfo &v4l2Exposure = sensorControls.find(V4L2_CID_EXPOSURE)->second;
int32_t minExposure = v4l2Exposure.min().get<int32_t>() * lineDuration; int32_t minExposure = v4l2Exposure.min().get<int32_t>() * lineDuration_.get<std::micro>();
int32_t maxExposure = v4l2Exposure.max().get<int32_t>() * lineDuration; int32_t maxExposure = v4l2Exposure.max().get<int32_t>() * lineDuration_.get<std::micro>();
int32_t defExposure = v4l2Exposure.def().get<int32_t>() * lineDuration; int32_t defExposure = v4l2Exposure.def().get<int32_t>() * lineDuration_.get<std::micro>();
controls[&controls::ExposureTime] = ControlInfo(minExposure, maxExposure, controls[&controls::ExposureTime] = ControlInfo(minExposure, maxExposure,
defExposure); defExposure);
@ -463,11 +459,13 @@ int IPAIPU3::configure(const IPAConfigInfo &configInfo,
calculateBdsGrid(configInfo.bdsOutputSize); calculateBdsGrid(configInfo.bdsOutputSize);
lineDuration_ = sensorInfo_.lineLength * 1.0s / sensorInfo_.pixelRate;
/* Update the camera controls using the new sensor settings. */ /* Update the camera controls using the new sensor settings. */
updateControls(sensorInfo_, ctrls_, ipaControls); updateControls(sensorInfo_, ctrls_, ipaControls);
/* Update the IPASessionConfiguration using the sensor settings. */ /* Update the IPASessionConfiguration using the sensor settings. */
updateSessionConfiguration(sensorInfo_, ctrls_); updateSessionConfiguration(ctrls_);
for (auto const &algo : algorithms_) { for (auto const &algo : algorithms_) {
int ret = algo->configure(context_, configInfo); int ret = algo->configure(context_, configInfo);
@ -627,8 +625,7 @@ void IPAIPU3::parseStatistics(unsigned int frame,
setControls(frame); setControls(frame);
/* \todo Use VBlank value calculated from each frame exposure. */ /* \todo Use VBlank value calculated from each frame exposure. */
int64_t frameDuration = sensorInfo_.lineLength * (defVBlank_ + sensorInfo_.outputSize.height) / int64_t frameDuration = (defVBlank_ + sensorInfo_.outputSize.height) * lineDuration_.get<std::micro>();
(sensorInfo_.pixelRate / 1e6);
ctrls.set(controls::FrameDuration, frameDuration); ctrls.set(controls::FrameDuration, frameDuration);
ctrls.set(controls::ColourTemperature, context_.frameContext.awb.temperatureK); ctrls.set(controls::ColourTemperature, context_.frameContext.awb.temperatureK);