diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-04-29 20:41:46 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-04-30 22:18:58 +0300 |
| commit | 3fc0189e209738f3119fbce62221aa2cc6afc8f2 (patch) | |
| tree | c861d3bc54864f113f2a335244bd88c52e14cdfe /src/libcamera/pipeline/rkisp1/rkisp1.cpp | |
| parent | a2dddf7c26df3307b9d4554c25387a00687a6234 (diff) | |
libcamera: pipeline: Unify naming of configurations in pipeline handlers
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>
Diffstat (limited to 'src/libcamera/pipeline/rkisp1/rkisp1.cpp')
| -rw-r--r-- | src/libcamera/pipeline/rkisp1/rkisp1.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 7acf8515..134d3df4 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -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, |