NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: ipu3: imgu: Rename configureInput()

Browse source 
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().

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Jacopo Mondi 2020-07-08 14:32:44 +02:00
parent 15df621fb9
commit 2dd19efffc
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libcamera/pipeline/ipu3/imgu.cpp
View file

@ -430,13 +430,12 @@ ImgUDevice::PipeConfig ImgUDevice::calculatePipeConfig(Pipe *pipe)
} }
/** /**
* \brief Configure the ImgU unit input * \brief Configure the ImgU pipeline
* \param[in] config The ImgU pipe configuration parameters * \param[in] config The ImgU pipe configuration parameters
* \param[in] inputFormat The format to be applied to ImgU input * \param[in] inputFormat The format to be applied to ImgU input
* \return 0 on success or a negative error code otherwise * \return 0 on success or a negative error code otherwise
*/ */
int ImgUDevice::configureInput(const PipeConfig &pipeConfig, int ImgUDevice::configure(const PipeConfig &pipeConfig, V4L2DeviceFormat *inputFormat)
V4L2DeviceFormat *inputFormat)
{ {
/* Configure the ImgU input video device with the requested sizes. */ /* Configure the ImgU input video device with the requested sizes. */
int ret = input_->setFormat(inputFormat); int ret = input_->setFormat(inputFormat);

2
src/libcamera/pipeline/ipu3/imgu.h
View file

@ -45,7 +45,7 @@ public:
PipeConfig calculatePipeConfig(Pipe *pipe); PipeConfig calculatePipeConfig(Pipe *pipe);
int configureInput(const PipeConfig &pipeConfig, V4L2DeviceFormat *inputFormat); int configure(const PipeConfig &pipeConfig, V4L2DeviceFormat *inputFormat);
int configureOutput(const StreamConfiguration &cfg, int configureOutput(const StreamConfiguration &cfg,
V4L2DeviceFormat *outputFormat) V4L2DeviceFormat *outputFormat)

2
src/libcamera/pipeline/ipu3/ipu3.cpp
View file

@ -476,7 +476,7 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)
if (imguConfig.isNull()) if (imguConfig.isNull())
return 0; return 0;
ret = imgu->configureInput(imguConfig, &cio2Format); ret = imgu->configure(imguConfig, &cio2Format);
if (ret) if (ret)
return ret; return ret;