[libcamera-devel] [PATCH v2 2/3] ipa: ipu3: Drop sensor controls private members from IPAIPU3

[Umang Jain]

Hi Kirean,

On 3/9/22 17:31, Kieran Bingham wrote:
> Quoting Umang Jain via libcamera-devel (2022-03-05 17:28:48)
>> Drop exposure, gain private members from IPAIPU3 because the values
>> are handled directly via IPAFrameContext.
>>
>> Move the default vblank value from IPAIPU3 to IPASessionContext
>> structure as it is a default static value not expected to change
>> for a session.
> I think the vblank can be updated if the frame rate changes. But that
> isn't something that happens now.


yeah, but also, it shouldn't be a part of IPASessionConfiguration. 
Notice I named the member as 'def'Vblank; so a changing 
vblank/frame-rate-oriented can be separately introduced.

>
>> Signed-off-by: Umang Jain <umang.jain at ideasonboard.com>
>> ---
>>   src/ipa/ipu3/ipa_context.h |  1 +
>>   src/ipa/ipu3/ipu3.cpp      | 29 +++++++++--------------------
>>   2 files changed, 10 insertions(+), 20 deletions(-)
>>
>> diff --git a/src/ipa/ipu3/ipa_context.h b/src/ipa/ipu3/ipa_context.h
>> index e7c49828..d993359a 100644
>> --- a/src/ipa/ipu3/ipa_context.h
>> +++ b/src/ipa/ipu3/ipa_context.h
>> @@ -33,6 +33,7 @@ struct IPASessionConfiguration {
>>          } agc;
>>   
>>          struct {
>> +               int32_t defVBlank;
> I think I'd be tempted to call this vBlank rather than defVBlank.
>
> In here it's not the 'default' vblank, it's the current/active vblank.


ah, I answered this above.

>
> If it gets updated, (which can happen I think) then it should be updated
> here. But I don't think this patch needs to handle updating it.
>
>
> I think with that:
>
> Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
>
>
>>                  utils::Duration lineDuration;
>>          } sensor;
>>   };
>> diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp
>> index 4b6852a7..0df358ba 100644
>> --- a/src/ipa/ipu3/ipu3.cpp
>> +++ b/src/ipa/ipu3/ipu3.cpp
>> @@ -164,11 +164,6 @@ private:
>>   
>>          IPACameraSensorInfo sensorInfo_;
>>   
>> -       /* Camera sensor controls. */
>> -       uint32_t defVBlank_;
>> -       uint32_t exposure_;
>> -       uint32_t gain_;
>> -
>>          /* Interface to the Camera Helper */
>>          std::unique_ptr<CameraSensorHelper> camHelper_;
>>   
>> @@ -185,15 +180,16 @@ private:
>>    */
>>   void IPAIPU3::updateSessionConfiguration(const ControlInfoMap &sensorControls)
>>   {
>> +       const ControlInfo vBlank = sensorControls.find(V4L2_CID_VBLANK)->second;
>> +       context_.configuration.sensor.defVBlank = vBlank.def().get<int32_t>();
>> +
>>          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>();
>> -       exposure_ = minExposure;
>>   
>>          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>();
>> -       gain_ = minGain;
>>   
>>          /*
>>           * When the AGC computes the new exposure values for a frame, it needs
>> @@ -427,14 +423,6 @@ int IPAIPU3::configure(const IPAConfigInfo &configInfo,
>>           */
>>          ctrls_ = configInfo.sensorControls;
>>   
>> -       const auto itVBlank = ctrls_.find(V4L2_CID_VBLANK);
>> -       if (itVBlank == ctrls_.end()) {
>> -               LOG(IPAIPU3, Error) << "Can't find VBLANK control";
>> -               return -EINVAL;
>> -       }
>> -
>> -       defVBlank_ = itVBlank->second.def().get<int32_t>();
>> -
>>          calculateBdsGrid(configInfo.bdsOutputSize);
>>   
>>          /* Clean frameContext at each reconfiguration. */
>> @@ -600,6 +588,7 @@ void IPAIPU3::parseStatistics(unsigned int frame,
>>                                const ipu3_uapi_stats_3a *stats)
>>   {
>>          double lineDuration = context_.configuration.sensor.lineDuration.get<std::micro>();
>> +       int32_t vBlank = context_.configuration.sensor.defVBlank;
>>          ControlList ctrls(controls::controls);
>>   
>>          for (auto const &algo : algorithms_)
>> @@ -608,7 +597,7 @@ void IPAIPU3::parseStatistics(unsigned int frame,
>>          setControls(frame);
>>   
>>          /* \todo Use VBlank value calculated from each frame exposure. */
>> -       int64_t frameDuration = (defVBlank_ + sensorInfo_.outputSize.height) * lineDuration;
>> +       int64_t frameDuration = (vBlank + sensorInfo_.outputSize.height) * lineDuration;
>>          ctrls.set(controls::FrameDuration, frameDuration);
>>   
>>          ctrls.set(controls::AnalogueGain, context_.frameContext.sensor.gain);
>> @@ -644,12 +633,12 @@ void IPAIPU3::setControls(unsigned int frame)
>>          IPU3Action op;
>>          op.op = ActionSetSensorControls;
>>   
>> -       exposure_ = context_.frameContext.agc.exposure;
>> -       gain_ = camHelper_->gainCode(context_.frameContext.agc.gain);
>> +       int32_t exposure = context_.frameContext.agc.exposure;
>> +       int32_t gain = camHelper_->gainCode(context_.frameContext.agc.gain);
>>   
>>          ControlList ctrls(ctrls_);
>> -       ctrls.set(V4L2_CID_EXPOSURE, static_cast<int32_t>(exposure_));
>> -       ctrls.set(V4L2_CID_ANALOGUE_GAIN, static_cast<int32_t>(gain_));
>> +       ctrls.set(V4L2_CID_EXPOSURE, exposure);
>> +       ctrls.set(V4L2_CID_ANALOGUE_GAIN, gain);
>>          op.sensorControls = ctrls;
>>   
>>          queueFrameAction.emit(frame, op);
>> -- 
>> 2.31.0
>>