[libcamera-devel,v3,13/14] ipa: ipu3: Move ExposureTime to IPA

14567 diff mbox series

Now that we have the exposure time calculated, pass it to the
controls::ExposureTime and don't use the pipeline handler for it
anymore. While at it, use the same line duration value for ExposureTime
and FrameDuration.

Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
---
 src/ipa/ipu3/ipu3.cpp                |  2 ++
 src/libcamera/pipeline/ipu3/ipu3.cpp | 16 +---------------
 2 files changed, 3 insertions(+), 15 deletions(-)

Quoting Jean-Michel Hautbois (2021-11-11 11:06:04)
> Now that we have the exposure time calculated, pass it to the
> controls::ExposureTime and don't use the pipeline handler for it
> anymore. While at it, use the same line duration value for ExposureTime
> and FrameDuration.

Needs updating?


> 
> Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
> ---
>  src/ipa/ipu3/ipu3.cpp                |  2 ++
>  src/libcamera/pipeline/ipu3/ipu3.cpp | 16 +---------------
>  2 files changed, 3 insertions(+), 15 deletions(-)
> 
> diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp
> index 3c1aa5ad..a91550b9 100644
> --- a/src/ipa/ipu3/ipu3.cpp
> +++ b/src/ipa/ipu3/ipu3.cpp
> @@ -631,6 +631,8 @@ void IPAIPU3::parseStatistics(unsigned int frame,
>  
>         ctrls.set(controls::ColourTemperature, context_.frameContext.awb.temperatureK);
>  
> +       ctrls.set(controls::ExposureTime, context_.frameContext.sensor.exposure * lineDuration_.get<std::micro>());
> +

A long line, but I don't mind that.

With the commit message updated:

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
>         /*
>          * \todo The Metadata provides a path to getting extended data
>          * out to the application. Further data such as a simplifed Histogram
> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
> index 3fcfa777..fe37e9c7 100644
> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp
> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
> @@ -47,7 +47,7 @@ class IPU3CameraData : public Camera::Private
>  {
>  public:
>         IPU3CameraData(PipelineHandler *pipe)
> -               : Camera::Private(pipe), exposureTime_(0), supportsFlips_(false)
> +               : Camera::Private(pipe), supportsFlips_(false)
>         {
>         }
>  
> @@ -67,7 +67,6 @@ public:
>         Stream vfStream_;
>         Stream rawStream_;
>  
> -       uint32_t exposureTime_;
>         Rectangle cropRegion_;
>         bool supportsFlips_;
>         Transform rotationTransform_;
> @@ -1049,17 +1048,6 @@ int PipelineHandlerIPU3::updateControls(IPU3CameraData *data)
>  
>         controls[&controls::ScalerCrop] = ControlInfo(minCrop, maxCrop, maxCrop);
>  
> -       /*
> -        * \todo Report the actual exposure time, use the default for the
> -        * moment.
> -        */
> -       const auto exposureInfo = data->ipaControls_.find(&controls::ExposureTime);
> -       if (exposureInfo == data->ipaControls_.end()) {
> -               LOG(IPU3, Error) << "Exposure control not initialized by the IPA";
> -               return -EINVAL;
> -       }
> -       data->exposureTime_ = exposureInfo->second.def().get<int32_t>();
> -
>         /* Add the IPA registered controls to list of camera controls. */
>         for (const auto &ipaControl : data->ipaControls_)
>                 controls[ipaControl.first] = ipaControl.second;
> @@ -1321,8 +1309,6 @@ void IPU3CameraData::imguOutputBufferReady(FrameBuffer *buffer)
>         pipe()->completeBuffer(request, buffer);
>  
>         request->metadata().set(controls::draft::PipelineDepth, 3);
> -       /* \todo Move the ExposureTime control to the IPA. */
> -       request->metadata().set(controls::ExposureTime, exposureTime_);
>         /* \todo Actually apply the scaler crop region to the ImgU. */
>         if (request->controls().contains(controls::ScalerCrop))
>                 cropRegion_ = request->controls().get(controls::ScalerCrop);
> -- 
> 2.32.0
>