[libcamera-devel,v2,20/20] libcamera: ipu3: imgu: Rename configureInput()
diff mbox series

Message ID 20200709084128.5316-21-jacopo@jmondi.org
State Accepted
Headers show
Series
  • libcamera: ipu3: Rework configuration
Related show

Commit Message

Jacopo Mondi July 9, 2020, 8:41 a.m. UTC 
The ImgUDevice::configureInput() function does not only configure the
input format but applies rectangles to the IF, BDS and GDC components.

Rename it to ImgUDevice::configure().

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
---
 src/libcamera/pipeline/ipu3/imgu.cpp | 3 +--
 src/libcamera/pipeline/ipu3/imgu.h   | 2 +-
 src/libcamera/pipeline/ipu3/ipu3.cpp | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

Comments

Niklas Söderlund July 9, 2020, 2:08 p.m. UTC | #1 
Hi Jacopo,

Thanks for your patch.

On 2020-07-09 10:41:28 +0200, Jacopo Mondi wrote:
> The ImgUDevice::configureInput() function does not only configure the
> input format but applies rectangles to the IF, BDS and GDC components.
> 
> Rename it to ImgUDevice::configure().
> 
> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

> ---
>  src/libcamera/pipeline/ipu3/imgu.cpp | 3 +--
>  src/libcamera/pipeline/ipu3/imgu.h   | 2 +-
>  src/libcamera/pipeline/ipu3/ipu3.cpp | 2 +-
>  3 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp
> index 69bcc4f30962..a9fd2f6d2aa6 100644
> --- a/src/libcamera/pipeline/ipu3/imgu.cpp
> +++ b/src/libcamera/pipeline/ipu3/imgu.cpp
> @@ -445,8 +445,7 @@ ImgUDevice::PipeConfig ImgUDevice::calculatePipeConfig(Pipe *pipe)
>   * \param[in] inputFormat The format to be applied to ImgU input
>   * \return 0 on success or a negative error code otherwise
>   */
> -int ImgUDevice::configureInput(const PipeConfig &pipeConfig,
> -			       V4L2DeviceFormat *inputFormat)
> +int ImgUDevice::configure(const PipeConfig &pipeConfig, V4L2DeviceFormat *inputFormat)
>  {
>  	/* Configure the ImgU input video device with the requested sizes. */
>  	int ret = input_->setFormat(inputFormat);
> diff --git a/src/libcamera/pipeline/ipu3/imgu.h b/src/libcamera/pipeline/ipu3/imgu.h
> index 6193c84bf35d..16525c8dc6d1 100644
> --- a/src/libcamera/pipeline/ipu3/imgu.h
> +++ b/src/libcamera/pipeline/ipu3/imgu.h
> @@ -45,7 +45,7 @@ public:
>  
>  	PipeConfig calculatePipeConfig(Pipe *pipe);
>  
> -	int configureInput(const PipeConfig &pipeConfig, V4L2DeviceFormat *inputFormat);
> +	int configure(const PipeConfig &pipeConfig, V4L2DeviceFormat *inputFormat);
>  
>  	int configureOutput(const StreamConfiguration &cfg,
>  			    V4L2DeviceFormat *outputFormat)
> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
> index d33aa7aee5e5..eb4c72b90f3a 100644
> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp
> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
> @@ -445,7 +445,7 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)
>  	if (ret)
>  		return ret;
>  
> -	ret = imgu->configureInput(config->imguConfig(), &cio2Format);
> +	ret = imgu->configure(config->imguConfig(), &cio2Format);
>  	if (ret)
>  		return ret;
>  
> -- 
> 2.27.0
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel
Laurent Pinchart July 10, 2020, 12:49 p.m. UTC | #2 
Hi Jacopo,

Thank you for the patch.

On Thu, Jul 09, 2020 at 10:41:28AM +0200, Jacopo Mondi wrote:
> The ImgUDevice::configureInput() function does not only configure the
> input format but applies rectangles to the IF, BDS and GDC components.
> 
> Rename it to ImgUDevice::configure().
> 
> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
> ---
>  src/libcamera/pipeline/ipu3/imgu.cpp | 3 +--
>  src/libcamera/pipeline/ipu3/imgu.h   | 2 +-
>  src/libcamera/pipeline/ipu3/ipu3.cpp | 2 +-
>  3 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp
> index 69bcc4f30962..a9fd2f6d2aa6 100644
> --- a/src/libcamera/pipeline/ipu3/imgu.cpp
> +++ b/src/libcamera/pipeline/ipu3/imgu.cpp
> @@ -445,8 +445,7 @@ ImgUDevice::PipeConfig ImgUDevice::calculatePipeConfig(Pipe *pipe)
>   * \param[in] inputFormat The format to be applied to ImgU input
>   * \return 0 on success or a negative error code otherwise
>   */
> -int ImgUDevice::configureInput(const PipeConfig &pipeConfig,
> -			       V4L2DeviceFormat *inputFormat)
> +int ImgUDevice::configure(const PipeConfig &pipeConfig, V4L2DeviceFormat *inputFormat)

The documentation still mentions "Configure the ImgU unit input".

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

>  {
>  	/* Configure the ImgU input video device with the requested sizes. */
>  	int ret = input_->setFormat(inputFormat);
> diff --git a/src/libcamera/pipeline/ipu3/imgu.h b/src/libcamera/pipeline/ipu3/imgu.h
> index 6193c84bf35d..16525c8dc6d1 100644
> --- a/src/libcamera/pipeline/ipu3/imgu.h
> +++ b/src/libcamera/pipeline/ipu3/imgu.h
> @@ -45,7 +45,7 @@ public:
>  
>  	PipeConfig calculatePipeConfig(Pipe *pipe);
>  
> -	int configureInput(const PipeConfig &pipeConfig, V4L2DeviceFormat *inputFormat);
> +	int configure(const PipeConfig &pipeConfig, V4L2DeviceFormat *inputFormat);
>  
>  	int configureOutput(const StreamConfiguration &cfg,
>  			    V4L2DeviceFormat *outputFormat)
> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
> index d33aa7aee5e5..eb4c72b90f3a 100644
> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp
> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
> @@ -445,7 +445,7 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)
>  	if (ret)
>  		return ret;
>  
> -	ret = imgu->configureInput(config->imguConfig(), &cio2Format);
> +	ret = imgu->configure(config->imguConfig(), &cio2Format);
>  	if (ret)
>  		return ret;
>

Patch
diff mbox series 

diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp
index 69bcc4f30962..a9fd2f6d2aa6 100644
--- a/src/libcamera/pipeline/ipu3/imgu.cpp
+++ b/src/libcamera/pipeline/ipu3/imgu.cpp
@@ -445,8 +445,7 @@  ImgUDevice::PipeConfig ImgUDevice::calculatePipeConfig(Pipe *pipe)
  * \param[in] inputFormat The format to be applied to ImgU input
  * \return 0 on success or a negative error code otherwise
  */
-int ImgUDevice::configureInput(const PipeConfig &pipeConfig,
-			       V4L2DeviceFormat *inputFormat)
+int ImgUDevice::configure(const PipeConfig &pipeConfig, V4L2DeviceFormat *inputFormat)
 {
 	/* Configure the ImgU input video device with the requested sizes. */
 	int ret = input_->setFormat(inputFormat);
diff --git a/src/libcamera/pipeline/ipu3/imgu.h b/src/libcamera/pipeline/ipu3/imgu.h
index 6193c84bf35d..16525c8dc6d1 100644
--- a/src/libcamera/pipeline/ipu3/imgu.h
+++ b/src/libcamera/pipeline/ipu3/imgu.h
@@ -45,7 +45,7 @@  public:
 
 	PipeConfig calculatePipeConfig(Pipe *pipe);
 
-	int configureInput(const PipeConfig &pipeConfig, V4L2DeviceFormat *inputFormat);
+	int configure(const PipeConfig &pipeConfig, V4L2DeviceFormat *inputFormat);
 
 	int configureOutput(const StreamConfiguration &cfg,
 			    V4L2DeviceFormat *outputFormat)
diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
index d33aa7aee5e5..eb4c72b90f3a 100644
--- a/src/libcamera/pipeline/ipu3/ipu3.cpp
+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
@@ -445,7 +445,7 @@  int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)
 	if (ret)
 		return ret;
 
-	ret = imgu->configureInput(config->imguConfig(), &cio2Format);
+	ret = imgu->configure(config->imguConfig(), &cio2Format);
 	if (ret)
 		return ret;