diff options
| author | Daniel Semkowicz via libcamera-devel <libcamera-devel@lists.libcamera.org> | 2022-06-28 11:06:55 +0200 |
|---|---|---|
| committer | Jacopo Mondi <jacopo@jmondi.org> | 2022-07-14 17:06:46 +0200 |
| commit | 7c52f539350998bda947a9083dc6c83ab7dd8273 (patch) | |
| tree | 6adf6ce862360e7ed72fd3bdefda6614e0631c00 | |
| parent | 094408e1220f70e17970b67d4c14d7aca31551b3 (diff) | |
libcamera: rkisp1: ipa: Rename ctrls_ to sensorCtrls_
As additional controls will be added to the IPA (like lens), we want to
have more specific names for each ControlInfoMap.
Signed-off-by: Daniel Semkowicz <dse@thaumatec.com>
| -rw-r--r-- | src/ipa/rkisp1/rkisp1.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index 21166b0f..33642094 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -71,7 +71,7 @@ private: std::map<unsigned int, FrameBuffer> buffers_; std::map<unsigned int, MappedFrameBuffer> mappedBuffers_; - ControlInfoMap ctrls_; + ControlInfoMap sensorCtrls_; /* Camera sensor controls. */ bool autoExposure_; @@ -178,16 +178,16 @@ int IPARkISP1::configure([[maybe_unused]] const IPACameraSensorInfo &info, if (entityControls.empty()) return -EINVAL; - ctrls_ = entityControls.at(0); + sensorCtrls_ = entityControls.at(0); - const auto itExp = ctrls_.find(V4L2_CID_EXPOSURE); - if (itExp == ctrls_.end()) { + const auto itExp = sensorCtrls_.find(V4L2_CID_EXPOSURE); + if (itExp == sensorCtrls_.end()) { LOG(IPARkISP1, Error) << "Can't find exposure control"; return -EINVAL; } - const auto itGain = ctrls_.find(V4L2_CID_ANALOGUE_GAIN); - if (itGain == ctrls_.end()) { + const auto itGain = sensorCtrls_.find(V4L2_CID_ANALOGUE_GAIN); + if (itGain == sensorCtrls_.end()) { LOG(IPARkISP1, Error) << "Can't find gain control"; return -EINVAL; } @@ -314,7 +314,7 @@ void IPARkISP1::setControls(unsigned int frame) uint32_t exposure = context_.frameContext.agc.exposure; uint32_t gain = camHelper_->gainCode(context_.frameContext.agc.gain); - ControlList ctrls(ctrls_); + ControlList ctrls(sensorCtrls_); ctrls.set(V4L2_CID_EXPOSURE, static_cast<int32_t>(exposure)); ctrls.set(V4L2_CID_ANALOGUE_GAIN, static_cast<int32_t>(gain)); |