diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-10-14 00:41:47 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-10-15 22:33:31 +0300 |
| commit | 207d57c8b4c066a0e70982f28e0084361d7448f2 (patch) | |
| tree | 87a4c329f433dfc4d24241601ef1578d084240c0 /src/ipa | |
| parent | 7bb4d7144c3e7c469310d4fd473653fb6cbfc1b8 (diff) | |
libcamera: v4l2_controls: Replace V4L2ControlInfo with V4L2ControlRange
The V4L2ControlInfo class only stores a ControlRange. Make it inherit
from ControlRange to provide a convenience constructor from a struct
v4l2_query_ext_ctrl and rename it to V4L2ControlRange.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src/ipa')
| -rw-r--r-- | src/ipa/rkisp1/rkisp1.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index 13059d99..d64c334c 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -83,12 +83,12 @@ void IPARkISP1::configure(const std::map<unsigned int, IPAStream> &streamConfig, autoExposure_ = true; - minExposure_ = std::max<uint32_t>(itExp->second.range().min().get<int32_t>(), 1); - maxExposure_ = itExp->second.range().max().get<int32_t>(); + minExposure_ = std::max<uint32_t>(itExp->second.min().get<int32_t>(), 1); + maxExposure_ = itExp->second.max().get<int32_t>(); exposure_ = minExposure_; - minGain_ = std::max<uint32_t>(itGain->second.range().min().get<int32_t>(), 1); - maxGain_ = itGain->second.range().max().get<int32_t>(); + minGain_ = std::max<uint32_t>(itGain->second.min().get<int32_t>(), 1); + maxGain_ = itGain->second.max().get<int32_t>(); gain_ = minGain_; LOG(IPARkISP1, Info) |