diff options
| -rw-r--r-- | src/ipa/rkisp1/rkisp1.cpp | 6 | ||||
| -rw-r--r-- | src/libcamera/pipeline/rkisp1/rkisp1.cpp | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index d2432982..50039b11 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -198,12 +198,6 @@ void IPARkISP1::stop() context_.frameContexts.clear(); } -/** - * \todo The RkISP1 pipeline currently provides an empty IPACameraSensorInfo - * if the connected sensor does not provide enough information to properly - * assemble one. Make sure the reported sensor information are relevant - * before accessing them. - */ int IPARkISP1::configure(const IPAConfigInfo &ipaConfig, [[maybe_unused]] const std::map<uint32_t, IPAStream> &streamConfig) { diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 4f0e1f8b..e946ccc4 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -719,9 +719,8 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c) ret = data->sensor_->sensorInfo(&ipaConfig.sensorInfo); if (ret) { - /* \todo Turn this into a hard failure. */ - LOG(RkISP1, Warning) << "Camera sensor information not available"; - ipaConfig.sensorInfo = {}; + LOG(RkISP1, Error) << "Camera sensor information not available"; + return ret; } ipaConfig.sensorControls = data->sensor_->controls(); |