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

libcamera: pipeline: Unify naming of configurations in pipeline handlers

Browse source 
Name all instances of CameraConfiguration "config", and all instances of
StreamConfiguration "cfg" accross all pipeline handlers.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart 2019-04-29 20:41:46 +03:00
parent a2dddf7c26
commit 3fc0189e20
6 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libcamera/camera.cpp
View file

@ -129,10 +129,10 @@ bool CameraConfiguration::isValid() const
return false;
for (auto const &it : config_) {
const StreamConfiguration &conf = it.second;
const StreamConfiguration &cfg = it.second;
if (conf.size.width == 0 || conf.size.height == 0 ||
conf.pixelFormat == 0 || conf.bufferCount == 0)
if (cfg.size.width == 0 || cfg.size.height == 0 ||
cfg.pixelFormat == 0 || cfg.bufferCount == 0)
return false;
}

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

@ -66,7 +66,7 @@ public:
int configureInput(const Size &size,
V4L2DeviceFormat *inputFormat);
int configureOutput(ImgUOutput *output,
const StreamConfiguration &config);
const StreamConfiguration &cfg);
int importBuffers(BufferPool *pool);
int exportBuffers(ImgUOutput *output, BufferPool *pool);
@ -224,14 +224,14 @@ PipelineHandlerIPU3::streamConfiguration(Camera *camera,
const std::vector<StreamUsage> &usages)
{
IPU3CameraData *data = cameraData(camera);
CameraConfiguration cameraConfig = {};
CameraConfiguration config = {};
std::set<IPU3Stream *> streams = {
&data->outStream_,
&data->vfStream_,
};
for (const StreamUsage &usage : usages) {
StreamConfiguration streamConfig = {};
StreamConfiguration cfg = {};
StreamUsage::Role role = usage.role();
IPU3Stream *stream = nullptr;
@ -262,7 +262,7 @@ PipelineHandlerIPU3::streamConfiguration(Camera *camera,
*
* \todo Clarify ImgU alignment requirements.
*/
streamConfig.size = { 2560, 1920 };
cfg.size = { 2560, 1920 };
break;
@ -294,7 +294,7 @@ PipelineHandlerIPU3::streamConfiguration(Camera *camera,
res.width);
unsigned int height = std::min(usage.size().height,
res.height);
streamConfig.size = { width & ~7, height & ~3 };
cfg.size = { width & ~7, height & ~3 };
break;
}
@ -310,13 +310,13 @@ PipelineHandlerIPU3::streamConfiguration(Camera *camera,
streams.erase(stream);
streamConfig.pixelFormat = V4L2_PIX_FMT_NV12;
streamConfig.bufferCount = IPU3_BUFFER_COUNT;
cfg.pixelFormat = V4L2_PIX_FMT_NV12;
cfg.bufferCount = IPU3_BUFFER_COUNT;
cameraConfig[stream] = streamConfig;
config[stream] = cfg;
}
return cameraConfig;
return config;
}
int PipelineHandlerIPU3::configureStreams(Camera *camera,
@ -424,10 +424,10 @@ int PipelineHandlerIPU3::configureStreams(Camera *camera,
* Apply the largest available format to the stat node.
* \todo Revise this when we'll actually use the stat node.
*/
StreamConfiguration statConfig = {};
statConfig.size = cio2Format.size;
StreamConfiguration statCfg = {};
statCfg.size = cio2Format.size;
ret = imgu->configureOutput(&imgu->stat_, statConfig);
ret = imgu->configureOutput(&imgu->stat_, statCfg);
if (ret)
return ret;
@ -959,18 +959,18 @@ int ImgUDevice::configureInput(const Size &size,
/**
* \brief Configure the ImgU unit \a id video output
* \param[in] output The ImgU output device to configure
* \param[in] config The requested configuration
* \param[in] cfg The requested configuration
* \return 0 on success or a negative error code otherwise
*/
int ImgUDevice::configureOutput(ImgUOutput *output,
const StreamConfiguration &config)
const StreamConfiguration &cfg)
{
V4L2Device *dev = output->dev;
unsigned int pad = output->pad;
V4L2SubdeviceFormat imguFormat = {};
imguFormat.mbus_code = MEDIA_BUS_FMT_FIXED;
imguFormat.size = config.size;
imguFormat.size = cfg.size;
int ret = imgu_->setFormat(pad, &imguFormat);
if (ret)
@ -982,7 +982,7 @@ int ImgUDevice::configureOutput(ImgUOutput *output,
V4L2DeviceFormat outputFormat = {};
outputFormat.fourcc = V4L2_PIX_FMT_NV12;
outputFormat.size = config.size;
outputFormat.size = cfg.size;
outputFormat.planesCount = 2;
ret = dev->setFormat(&outputFormat);

14
src/libcamera/pipeline/rkisp1/rkisp1.cpp
View file

@ -113,16 +113,16 @@ CameraConfiguration PipelineHandlerRkISP1::streamConfiguration(Camera *camera,
const std::vector<StreamUsage> &usages)
{
RkISP1CameraData *data = cameraData(camera);
CameraConfiguration configs;
StreamConfiguration config{};
CameraConfiguration config;
StreamConfiguration cfg{};
config.pixelFormat = V4L2_PIX_FMT_NV12;
config.size = data->sensor_->resolution();
config.bufferCount = RKISP1_BUFFER_COUNT;
cfg.pixelFormat = V4L2_PIX_FMT_NV12;
cfg.size = data->sensor_->resolution();
cfg.bufferCount = RKISP1_BUFFER_COUNT;
configs[&data->stream_] = config;
config[&data->stream_] = cfg;
return configs;
return config;
}
int PipelineHandlerRkISP1::configureStreams(Camera *camera,

14
src/libcamera/pipeline/uvcvideo.cpp
View file

@ -89,16 +89,16 @@ PipelineHandlerUVC::streamConfiguration(Camera *camera,
const std::vector<StreamUsage> &usages)
{
UVCCameraData *data = cameraData(camera);
CameraConfiguration configs;
StreamConfiguration config{};
CameraConfiguration config;
StreamConfiguration cfg{};
config.pixelFormat = V4L2_PIX_FMT_YUYV;
config.size = { 640, 480 };
config.bufferCount = 4;
cfg.pixelFormat = V4L2_PIX_FMT_YUYV;
cfg.size = { 640, 480 };
cfg.bufferCount = 4;
configs[&data->stream_] = config;
config[&data->stream_] = cfg;
return configs;
return config;
}
int PipelineHandlerUVC::configureStreams(Camera *camera,

14
src/libcamera/pipeline/vimc.cpp
View file

@ -89,16 +89,16 @@ PipelineHandlerVimc::streamConfiguration(Camera *camera,
const std::vector<StreamUsage> &usages)
{
VimcCameraData *data = cameraData(camera);
CameraConfiguration configs;
StreamConfiguration config{};
CameraConfiguration config;
StreamConfiguration cfg{};
config.pixelFormat = V4L2_PIX_FMT_RGB24;
config.size = { 640, 480 };
config.bufferCount = 4;
cfg.pixelFormat = V4L2_PIX_FMT_RGB24;
cfg.size = { 640, 480 };
cfg.bufferCount = 4;
configs[&data->stream_] = config;
config[&data->stream_] = cfg;
return configs;
return config;
}
int PipelineHandlerVimc::configureStreams(Camera *camera,

2
src/libcamera/pipeline_handler.cpp
View file

@ -175,7 +175,7 @@ PipelineHandler::~PipelineHandler()
* \param[in] config The camera configurations to setup
*
* Configure the specified group of streams for \a camera according to the
* configuration specified in \a configs. The intended caller of this interface
* configuration specified in \a config. The intended caller of this interface
* is the Camera class which will receive configuration to apply from the
* application.
*