[libcamera-devel] [PATCH 14/15] libcamera: ipu3: Rename ImgUDevice::configureInput()

Jacopo Mondi jacopo at jmondi.org
Wed Jul 1 14:30:35 CEST 2020


Rename the ImgUDevice::configureInput() method to just configure() as it
will be modified not only configure the ImgU unit input, but calculate
the whole pipeline configuration parameters.

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

diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp
index 49201157eb07..f580c1d2ff6c 100644
--- a/src/libcamera/pipeline/ipu3/imgu.cpp
+++ b/src/libcamera/pipeline/ipu3/imgu.cpp
@@ -99,7 +99,7 @@ int ImgUDevice::init(MediaDevice *media, unsigned int index)
  * \param[in] inputFormat The format to be applied to ImgU input
  * \return 0 on success or a negative error code otherwise
  */
-int ImgUDevice::configureInput(struct Pipe *pipe, V4L2DeviceFormat *inputFormat)
+int ImgUDevice::configure(struct Pipe *pipe, 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 c0353955ea43..45c5cc1ce8e6 100644
--- a/src/libcamera/pipeline/ipu3/imgu.h
+++ b/src/libcamera/pipeline/ipu3/imgu.h
@@ -31,7 +31,7 @@ public:
 
 	int init(MediaDevice *media, unsigned int index);
 
-	int configureInput(struct Pipe *pipe, V4L2DeviceFormat *inputFormat);
+	int configure(struct Pipe *pipe, 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 9499c127ef79..317e78155ebb 100644
--- a/src/libcamera/pipeline/ipu3/ipu3.cpp
+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
@@ -459,7 +459,7 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)
 	 * Configure the ImgU with the collected pipe configuration and the
 	 * CIO2 unit format.
 	 */
-	ret = imgu->configureInput(&imguPipe, &cio2Format);
+	ret = imgu->configure(&imguPipe, &cio2Format);
 	if (ret)
 		return ret;
 
-- 
2.27.0



More information about the libcamera-devel mailing list