NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

ipa: raspberrypi: agc: Remove using namespace in agc.hpp

Browse source 
"using namespace" in a header file propagates the namespace to
the files including the header file. So it should be avoided.
This removes "using namespace" in agc.hpp.

Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: David Plowman <david.plowman@raspberrypi.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Hirokazu Honda 2021-10-05 16:31:09 +09:00 • committed by Laurent Pinchart
parent 411987838e
commit ba7cf5d654
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ipa/raspberrypi/controller/rpi/agc.cpp
View file

@ -22,6 +22,7 @@
using namespace RPiController; using namespace RPiController;
using namespace libcamera; using namespace libcamera;
using libcamera::utils::Duration; using libcamera::utils::Duration;
using namespace std::literals::chrono_literals;
LOG_DEFINE_CATEGORY(RPiAgc) LOG_DEFINE_CATEGORY(RPiAgc)
@ -159,6 +160,12 @@ void AgcConfig::Read(boost::property_tree::ptree const &params)
default_analogue_gain = params.get<double>("default_analogue_gain", 1.0); default_analogue_gain = params.get<double>("default_analogue_gain", 1.0);
} }
Agc::ExposureValues::ExposureValues()
: shutter(0s), analogue_gain(0),
total_exposure(0s), total_exposure_no_dg(0s)
{
}
Agc::Agc(Controller *controller) Agc::Agc(Controller *controller)
: AgcAlgorithm(controller), metering_mode_(nullptr), : AgcAlgorithm(controller), metering_mode_(nullptr),
exposure_mode_(nullptr), constraint_mode_(nullptr), exposure_mode_(nullptr), constraint_mode_(nullptr),

6
src/ipa/raspberrypi/controller/rpi/agc.hpp
View file

@ -24,8 +24,6 @@
namespace RPiController { namespace RPiController {
using namespace std::literals::chrono_literals;
struct AgcMeteringMode { struct AgcMeteringMode {
double weights[AGC_STATS_SIZE]; double weights[AGC_STATS_SIZE];
void Read(boost::property_tree::ptree const &params); void Read(boost::property_tree::ptree const &params);
@ -112,8 +110,8 @@ private:
uint64_t frame_count_; uint64_t frame_count_;
AwbStatus awb_; AwbStatus awb_;
struct ExposureValues { struct ExposureValues {
ExposureValues() : shutter(0s), analogue_gain(0), ExposureValues();
total_exposure(0s), total_exposure_no_dg(0s) {}
libcamera::utils::Duration shutter; libcamera::utils::Duration shutter;
double analogue_gain; double analogue_gain;
libcamera::utils::Duration total_exposure; libcamera::utils::Duration total_exposure;