[libcamera-devel,v3,12/14] ipa: ipu3: Cache line duration at configure call
diff mbox series

Message ID 20211111110605.105202-13-jeanmichel.hautbois@ideasonboard.com
State Superseded
Headers show
Series
  • IPA: IPU3: Introduce per-frame controls
Related show

Commit Message

Jean-Michel Hautbois Nov. 11, 2021, 11:06 a.m. UTC 
We use the line duration several times in the IPAIPU3. Instead of
recalculating it each time, cache the value as a utils::Duration. When
the value is needed in double, cast it to a std::micro value.

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

Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
---
 src/ipa/ipu3/ipu3.cpp | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

Comments

Kieran Bingham Nov. 11, 2021, 1:21 p.m. UTC | #1 
Quoting Jean-Michel Hautbois (2021-11-11 11:06:03)
> We use the line duration several times in the IPAIPU3. Instead of
> recalculating it each time, cache the value as a utils::Duration. When
> the value is needed in double, cast it to a std::micro value.

The value isn't needed in a double. It's needed to calculate the
exposure in microseconds... It's just that it returns a double. It could
be an int for all the calculation cares...



> 
> As sensorInfo is no longer used in updateSessionConfiguration remove the
> reference to it.
> 
> Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
> ---
>  src/ipa/ipu3/ipu3.cpp | 29 +++++++++++++----------------
>  1 file changed, 13 insertions(+), 16 deletions(-)
> 
> diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp
> index 7762c5ec..3c1aa5ad 100644
> --- a/src/ipa/ipu3/ipu3.cpp
> +++ b/src/ipa/ipu3/ipu3.cpp
> @@ -148,8 +148,7 @@ private:
>         void updateControls(const IPACameraSensorInfo &sensorInfo,
>                             const ControlInfoMap &sensorControls,
>                             ControlInfoMap *ipaControls);
> -       void updateSessionConfiguration(const IPACameraSensorInfo &sensorInfo,
> -                                       const ControlInfoMap &sensorControls);
> +       void updateSessionConfiguration(const ControlInfoMap &sensorControls);
>         void processControls(unsigned int frame, const ControlList &controls);
>         void fillParams(unsigned int frame, ipu3_uapi_params *params);
>         void parseStatistics(unsigned int frame,
> @@ -174,6 +173,8 @@ private:
>         uint32_t minGain_;
>         uint32_t maxGain_;
>  
> +       utils::Duration lineDuration_;
> +
>         /* Interface to the Camera Helper */
>         std::unique_ptr<CameraSensorHelper> camHelper_;
>  
> @@ -188,16 +189,12 @@ private:
>   * \brief Compute IPASessionConfiguration using the sensor information and the
>   * sensor V4L2 controls
>   */
> -void IPAIPU3::updateSessionConfiguration(const IPACameraSensorInfo &sensorInfo,
> -                                        const ControlInfoMap &sensorControls)
> +void IPAIPU3::updateSessionConfiguration(const ControlInfoMap &sensorControls)
>  {
>         const ControlInfo &v4l2Exposure = sensorControls.find(V4L2_CID_EXPOSURE)->second;
>         int32_t minExposure = v4l2Exposure.min().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;
>         int32_t minGain = v4l2Gain.min().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
>          */
> -       context_.configuration.agc.minShutterSpeed = minExposure * lineDuration;
> -       context_.configuration.agc.maxShutterSpeed = maxExposure * lineDuration;
> +       context_.configuration.agc.minShutterSpeed = minExposure * lineDuration_;
> +       context_.configuration.agc.maxShutterSpeed = maxExposure * lineDuration_;
>         context_.configuration.agc.minAnalogueGain = camHelper_->gain(minGain);
>         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
>          * microseconds.
>          */
> -       double lineDuration = sensorInfo.lineLength / (sensorInfo.pixelRate / 1e6);
>         const ControlInfo &v4l2Exposure = sensorControls.find(V4L2_CID_EXPOSURE)->second;
> -       int32_t minExposure = v4l2Exposure.min().get<int32_t>() * lineDuration;
> -       int32_t maxExposure = v4l2Exposure.max().get<int32_t>() * lineDuration;
> -       int32_t defExposure = v4l2Exposure.def().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_.get<std::micro>();
> +       int32_t defExposure = v4l2Exposure.def().get<int32_t>() * lineDuration_.get<std::micro>();
>         controls[&controls::ExposureTime] = ControlInfo(minExposure, maxExposure,
>                                                         defExposure);
>  
> @@ -463,11 +459,13 @@ int IPAIPU3::configure(const IPAConfigInfo &configInfo,
>  
>         calculateBdsGrid(configInfo.bdsOutputSize);
>  
> +       lineDuration_ = sensorInfo_.lineLength * 1.0s / sensorInfo_.pixelRate;
> +
>         /* Update the camera controls using the new sensor settings. */
>         updateControls(sensorInfo_, ctrls_, ipaControls);
>  
>         /* Update the IPASessionConfiguration using the sensor settings. */
> -       updateSessionConfiguration(sensorInfo_, ctrls_);
> +       updateSessionConfiguration(ctrls_);
>  
>         for (auto const &algo : algorithms_) {
>                 int ret = algo->configure(context_, configInfo);
> @@ -628,8 +626,7 @@ void IPAIPU3::parseStatistics(unsigned int frame,
>         setControls(frame);
>  
>         /* \todo Use VBlank value calculated from each frame exposure. */
> -       int64_t frameDuration = sensorInfo_.lineLength * (defVBlank_ + sensorInfo_.outputSize.height) /
> -                               (sensorInfo_.pixelRate / 1e6);
> +       int64_t frameDuration = (defVBlank_ + sensorInfo_.outputSize.height) * lineDuration_.get<std::micro>();

Perhaps could make that
	int64_t frameDuration = (defVBlank_ + sensorInfo_.outputSize.height)
			      * lineDuration_.get<std::micro>();

to shorten the line, but that's optional.

With the commit message update:


Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

>         ctrls.set(controls::FrameDuration, frameDuration);
>  
>         ctrls.set(controls::ColourTemperature, context_.frameContext.awb.temperatureK);
> -- 
> 2.32.0
>
Jean-Michel Hautbois Nov. 11, 2021, 1:58 p.m. UTC | #2 
On 11/11/2021 14:21, Kieran Bingham wrote:
> Quoting Jean-Michel Hautbois (2021-11-11 11:06:03)
>> We use the line duration several times in the IPAIPU3. Instead of
>> recalculating it each time, cache the value as a utils::Duration. When
>> the value is needed in double, cast it to a std::micro value.
> 
> The value isn't needed in a double. It's needed to calculate the
> exposure in microseconds... It's just that it returns a double. It could
> be an int for all the calculation cares...

OK, I made the message:
s/the value is needed in double, cast it/the value is needed, cast it/

> 
> 
> 
>>
>> As sensorInfo is no longer used in updateSessionConfiguration remove the
>> reference to it.
>>
>> Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
>> ---
>>   src/ipa/ipu3/ipu3.cpp | 29 +++++++++++++----------------
>>   1 file changed, 13 insertions(+), 16 deletions(-)
>>
>> diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp
>> index 7762c5ec..3c1aa5ad 100644
>> --- a/src/ipa/ipu3/ipu3.cpp
>> +++ b/src/ipa/ipu3/ipu3.cpp
>> @@ -148,8 +148,7 @@ private:
>>          void updateControls(const IPACameraSensorInfo &sensorInfo,
>>                              const ControlInfoMap &sensorControls,
>>                              ControlInfoMap *ipaControls);
>> -       void updateSessionConfiguration(const IPACameraSensorInfo &sensorInfo,
>> -                                       const ControlInfoMap &sensorControls);
>> +       void updateSessionConfiguration(const ControlInfoMap &sensorControls);
>>          void processControls(unsigned int frame, const ControlList &controls);
>>          void fillParams(unsigned int frame, ipu3_uapi_params *params);
>>          void parseStatistics(unsigned int frame,
>> @@ -174,6 +173,8 @@ private:
>>          uint32_t minGain_;
>>          uint32_t maxGain_;
>>   
>> +       utils::Duration lineDuration_;
>> +
>>          /* Interface to the Camera Helper */
>>          std::unique_ptr<CameraSensorHelper> camHelper_;
>>   
>> @@ -188,16 +189,12 @@ private:
>>    * \brief Compute IPASessionConfiguration using the sensor information and the
>>    * sensor V4L2 controls
>>    */
>> -void IPAIPU3::updateSessionConfiguration(const IPACameraSensorInfo &sensorInfo,
>> -                                        const ControlInfoMap &sensorControls)
>> +void IPAIPU3::updateSessionConfiguration(const ControlInfoMap &sensorControls)
>>   {
>>          const ControlInfo &v4l2Exposure = sensorControls.find(V4L2_CID_EXPOSURE)->second;
>>          int32_t minExposure = v4l2Exposure.min().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;
>>          int32_t minGain = v4l2Gain.min().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
>>           */
>> -       context_.configuration.agc.minShutterSpeed = minExposure * lineDuration;
>> -       context_.configuration.agc.maxShutterSpeed = maxExposure * lineDuration;
>> +       context_.configuration.agc.minShutterSpeed = minExposure * lineDuration_;
>> +       context_.configuration.agc.maxShutterSpeed = maxExposure * lineDuration_;
>>          context_.configuration.agc.minAnalogueGain = camHelper_->gain(minGain);
>>          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
>>           * microseconds.
>>           */
>> -       double lineDuration = sensorInfo.lineLength / (sensorInfo.pixelRate / 1e6);
>>          const ControlInfo &v4l2Exposure = sensorControls.find(V4L2_CID_EXPOSURE)->second;
>> -       int32_t minExposure = v4l2Exposure.min().get<int32_t>() * lineDuration;
>> -       int32_t maxExposure = v4l2Exposure.max().get<int32_t>() * lineDuration;
>> -       int32_t defExposure = v4l2Exposure.def().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_.get<std::micro>();
>> +       int32_t defExposure = v4l2Exposure.def().get<int32_t>() * lineDuration_.get<std::micro>();
>>          controls[&controls::ExposureTime] = ControlInfo(minExposure, maxExposure,
>>                                                          defExposure);
>>   
>> @@ -463,11 +459,13 @@ int IPAIPU3::configure(const IPAConfigInfo &configInfo,
>>   
>>          calculateBdsGrid(configInfo.bdsOutputSize);
>>   
>> +       lineDuration_ = sensorInfo_.lineLength * 1.0s / sensorInfo_.pixelRate;
>> +
>>          /* Update the camera controls using the new sensor settings. */
>>          updateControls(sensorInfo_, ctrls_, ipaControls);
>>   
>>          /* Update the IPASessionConfiguration using the sensor settings. */
>> -       updateSessionConfiguration(sensorInfo_, ctrls_);
>> +       updateSessionConfiguration(ctrls_);
>>   
>>          for (auto const &algo : algorithms_) {
>>                  int ret = algo->configure(context_, configInfo);
>> @@ -628,8 +626,7 @@ void IPAIPU3::parseStatistics(unsigned int frame,
>>          setControls(frame);
>>   
>>          /* \todo Use VBlank value calculated from each frame exposure. */
>> -       int64_t frameDuration = sensorInfo_.lineLength * (defVBlank_ + sensorInfo_.outputSize.height) /
>> -                               (sensorInfo_.pixelRate / 1e6);
>> +       int64_t frameDuration = (defVBlank_ + sensorInfo_.outputSize.height) * lineDuration_.get<std::micro>();
> 
> Perhaps could make that
> 	int64_t frameDuration = (defVBlank_ + sensorInfo_.outputSize.height)
> 			      * lineDuration_.get<std::micro>();
> 
> to shorten the line, but that's optional.

And checkstyle is not happy... ;-)

> 
> With the commit message update:
> 
> 
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> 
>>          ctrls.set(controls::FrameDuration, frameDuration);
>>   
>>          ctrls.set(controls::ColourTemperature, context_.frameContext.awb.temperatureK);
>> -- 
>> 2.32.0
>>
Kieran Bingham Nov. 12, 2021, 1:18 p.m. UTC | #3 
Quoting Jean-Michel Hautbois (2021-11-11 13:58:57)
> 
> 
> On 11/11/2021 14:21, Kieran Bingham wrote:
> > Quoting Jean-Michel Hautbois (2021-11-11 11:06:03)
> >> We use the line duration several times in the IPAIPU3. Instead of
> >> recalculating it each time, cache the value as a utils::Duration. When
> >> the value is needed in double, cast it to a std::micro value.
> > 
> > The value isn't needed in a double. It's needed to calculate the
> > exposure in microseconds... It's just that it returns a double. It could
> > be an int for all the calculation cares...
> 
> OK, I made the message:
> s/the value is needed in double, cast it/the value is needed, cast it/

I'll check in v4...

> >> As sensorInfo is no longer used in updateSessionConfiguration remove the
> >> reference to it.
> >>
> >> Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
> >> ---
> >> +       int64_t frameDuration = (defVBlank_ + sensorInfo_.outputSize.height) * lineDuration_.get<std::micro>();
> > 
> > Perhaps could make that
> >       int64_t frameDuration = (defVBlank_ + sensorInfo_.outputSize.height)
> >                             * lineDuration_.get<std::micro>();
> > 
> > to shorten the line, but that's optional.
> 
> And checkstyle is not happy... ;-)

Unfortuantely, checkstyle is still fallable. We have to decide for
ourselves in some cases.

If we could tell clang-format "Prefer less than 80, but it's acceptable
to go to 120 in some/extreme cases" and it to know what those extreme
cases were - then maybe it would do different... but it's just not so
easy :-(

Anyway, it's optional for me ;-)

> > 
> > With the commit message update:
> > 
> > 
> > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> > 
> >>          ctrls.set(controls::FrameDuration, frameDuration);
> >>   
> >>          ctrls.set(controls::ColourTemperature, context_.frameContext.awb.temperatureK);
> >> -- 
> >> 2.32.0
> >>

Patch
diff mbox series 

diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp
index 7762c5ec..3c1aa5ad 100644
--- a/src/ipa/ipu3/ipu3.cpp
+++ b/src/ipa/ipu3/ipu3.cpp
@@ -148,8 +148,7 @@  private:
 	void updateControls(const IPACameraSensorInfo &sensorInfo,
 			    const ControlInfoMap &sensorControls,
 			    ControlInfoMap *ipaControls);
-	void updateSessionConfiguration(const IPACameraSensorInfo &sensorInfo,
-					const ControlInfoMap &sensorControls);
+	void updateSessionConfiguration(const ControlInfoMap &sensorControls);
 	void processControls(unsigned int frame, const ControlList &controls);
 	void fillParams(unsigned int frame, ipu3_uapi_params *params);
 	void parseStatistics(unsigned int frame,
@@ -174,6 +173,8 @@  private:
 	uint32_t minGain_;
 	uint32_t maxGain_;
 
+	utils::Duration lineDuration_;
+
 	/* Interface to the Camera Helper */
 	std::unique_ptr<CameraSensorHelper> camHelper_;
 
@@ -188,16 +189,12 @@  private:
  * \brief Compute IPASessionConfiguration using the sensor information and the
  * sensor V4L2 controls
  */
-void IPAIPU3::updateSessionConfiguration(const IPACameraSensorInfo &sensorInfo,
-					 const ControlInfoMap &sensorControls)
+void IPAIPU3::updateSessionConfiguration(const ControlInfoMap &sensorControls)
 {
 	const ControlInfo &v4l2Exposure = sensorControls.find(V4L2_CID_EXPOSURE)->second;
 	int32_t minExposure = v4l2Exposure.min().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;
 	int32_t minGain = v4l2Gain.min().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
 	 */
-	context_.configuration.agc.minShutterSpeed = minExposure * lineDuration;
-	context_.configuration.agc.maxShutterSpeed = maxExposure * lineDuration;
+	context_.configuration.agc.minShutterSpeed = minExposure * lineDuration_;
+	context_.configuration.agc.maxShutterSpeed = maxExposure * lineDuration_;
 	context_.configuration.agc.minAnalogueGain = camHelper_->gain(minGain);
 	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
 	 * microseconds.
 	 */
-	double lineDuration = sensorInfo.lineLength / (sensorInfo.pixelRate / 1e6);
 	const ControlInfo &v4l2Exposure = sensorControls.find(V4L2_CID_EXPOSURE)->second;
-	int32_t minExposure = v4l2Exposure.min().get<int32_t>() * lineDuration;
-	int32_t maxExposure = v4l2Exposure.max().get<int32_t>() * lineDuration;
-	int32_t defExposure = v4l2Exposure.def().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_.get<std::micro>();
+	int32_t defExposure = v4l2Exposure.def().get<int32_t>() * lineDuration_.get<std::micro>();
 	controls[&controls::ExposureTime] = ControlInfo(minExposure, maxExposure,
 							defExposure);
 
@@ -463,11 +459,13 @@  int IPAIPU3::configure(const IPAConfigInfo &configInfo,
 
 	calculateBdsGrid(configInfo.bdsOutputSize);
 
+	lineDuration_ = sensorInfo_.lineLength * 1.0s / sensorInfo_.pixelRate;
+
 	/* Update the camera controls using the new sensor settings. */
 	updateControls(sensorInfo_, ctrls_, ipaControls);
 
 	/* Update the IPASessionConfiguration using the sensor settings. */
-	updateSessionConfiguration(sensorInfo_, ctrls_);
+	updateSessionConfiguration(ctrls_);
 
 	for (auto const &algo : algorithms_) {
 		int ret = algo->configure(context_, configInfo);
@@ -628,8 +626,7 @@  void IPAIPU3::parseStatistics(unsigned int frame,
 	setControls(frame);
 
 	/* \todo Use VBlank value calculated from each frame exposure. */
-	int64_t frameDuration = sensorInfo_.lineLength * (defVBlank_ + sensorInfo_.outputSize.height) /
-				(sensorInfo_.pixelRate / 1e6);
+	int64_t frameDuration = (defVBlank_ + sensorInfo_.outputSize.height) * lineDuration_.get<std::micro>();
 	ctrls.set(controls::FrameDuration, frameDuration);
 
 	ctrls.set(controls::ColourTemperature, context_.frameContext.awb.temperatureK);