[libcamera-devel] [PATCH 10/11] libcamera: ipu3: imgu: Allocate buffers for stats and param

[Laurent Pinchart]

Hi Niklas,

Thank you for the patch.

On Thu, Nov 05, 2020 at 01:15:45AM +0100, Niklas Söderlund wrote:
> Instead of preparing for buffer importing allocate buffers that can be
> used by an IPA.
> 
> Signed-off-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>

Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

> ---
>  src/libcamera/pipeline/ipu3/imgu.cpp | 14 +++++---------
>  src/libcamera/pipeline/ipu3/imgu.h   |  3 +++
>  2 files changed, 8 insertions(+), 9 deletions(-)
> 
> diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp
> index 547a9e00325e7519..1dfa968d00379631 100644
> --- a/src/libcamera/pipeline/ipu3/imgu.cpp
> +++ b/src/libcamera/pipeline/ipu3/imgu.cpp
> @@ -551,20 +551,13 @@ int ImgUDevice::allocateBuffers(unsigned int bufferCount)
>  		return ret;
>  	}
>  
> -	ret = param_->importBuffers(bufferCount);
> +	ret = param_->allocateBuffers(bufferCount, &paramBuffers_);
>  	if (ret < 0) {
>  		LOG(IPU3, Error) << "Failed to allocate ImgU param buffers";
>  		goto error;
>  	}
>  
> -	/*
> -	 * The kernel fails to start if buffers are not either imported or
> -	 * allocated for the statistics video device. As statistics buffers are
> -	 * not yet used by the pipeline import buffers to save memory.
> -	 *
> -	 * \todo To be revised when we'll actually use the stat node.
> -	 */
> -	ret = stat_->importBuffers(bufferCount);
> +	ret = stat_->allocateBuffers(bufferCount, &statBuffers_);
>  	if (ret < 0) {
>  		LOG(IPU3, Error) << "Failed to allocate ImgU stat buffers";
>  		goto error;
> @@ -602,6 +595,9 @@ void ImgUDevice::freeBuffers()
>  {
>  	int ret;
>  
> +	paramBuffers_.clear();
> +	statBuffers_.clear();
> +
>  	ret = output_->releaseBuffers();
>  	if (ret)
>  		LOG(IPU3, Error) << "Failed to release ImgU output buffers";
> diff --git a/src/libcamera/pipeline/ipu3/imgu.h b/src/libcamera/pipeline/ipu3/imgu.h
> index 1388d07a45b28590..05fbc26648549bd6 100644
> --- a/src/libcamera/pipeline/ipu3/imgu.h
> +++ b/src/libcamera/pipeline/ipu3/imgu.h
> @@ -76,6 +76,9 @@ public:
>  	std::unique_ptr<V4L2VideoDevice> param_;
>  	std::unique_ptr<V4L2VideoDevice> stat_;
>  
> +	std::vector<std::unique_ptr<FrameBuffer>> paramBuffers_;
> +	std::vector<std::unique_ptr<FrameBuffer>> statBuffers_;
> +
>  private:
>  	static constexpr unsigned int PAD_INPUT = 0;
>  	static constexpr unsigned int PAD_PARAM = 1;

-- 
Regards,

Laurent Pinchart