summaryrefslogtreecommitdiff
path: root/src/libcamera/pipeline/rkisp1/rkisp1.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/libcamera/pipeline/rkisp1/rkisp1.cpp')
-rw-r--r--src/libcamera/pipeline/rkisp1/rkisp1.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
index 4bd8c510..ec6980b0 100644
--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
@@ -36,8 +36,7 @@ public:
CameraConfiguration generateConfiguration(Camera *camera,
const StreamRoles &roles) override;
- int configure(Camera *camera,
- const CameraConfiguration &config) override;
+ int configure(Camera *camera, CameraConfiguration &config) override;
int allocateBuffers(Camera *camera,
const std::set<Stream *> &streams) override;
@@ -117,16 +116,15 @@ CameraConfiguration PipelineHandlerRkISP1::generateConfiguration(Camera *camera,
cfg.size = data->sensor_->resolution();
cfg.bufferCount = RKISP1_BUFFER_COUNT;
- config[&data->stream_] = cfg;
+ config.addConfiguration(cfg);
return config;
}
-int PipelineHandlerRkISP1::configure(Camera *camera,
- const CameraConfiguration &config)
+int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration &config)
{
RkISP1CameraData *data = cameraData(camera);
- const StreamConfiguration &cfg = config[&data->stream_];
+ StreamConfiguration &cfg = config[0];
CameraSensor *sensor = data->sensor_;
int ret;
@@ -217,6 +215,8 @@ int PipelineHandlerRkISP1::configure(Camera *camera,
return -EINVAL;
}
+ cfg.setStream(&data->stream_);
+
return 0;
}