From 207d57c8b4c066a0e70982f28e0084361d7448f2 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 14 Oct 2019 00:41:47 +0300 Subject: libcamera: v4l2_controls: Replace V4L2ControlInfo with V4L2ControlRange MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Niklas Söderlund Reviewed-by: Jacopo Mondi --- src/ipa/rkisp1/rkisp1.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/ipa/rkisp1') 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 &streamConfig, autoExposure_ = true; - minExposure_ = std::max(itExp->second.range().min().get(), 1); - maxExposure_ = itExp->second.range().max().get(); + minExposure_ = std::max(itExp->second.min().get(), 1); + maxExposure_ = itExp->second.max().get(); exposure_ = minExposure_; - minGain_ = std::max(itGain->second.range().min().get(), 1); - maxGain_ = itGain->second.range().max().get(); + minGain_ = std::max(itGain->second.min().get(), 1); + maxGain_ = itGain->second.max().get(); gain_ = minGain_; LOG(IPARkISP1, Info) -- cgit v1.2.1