| Message ID | 20210709145825.2943443-9-naush@raspberrypi.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series |
|
| Related | show |
Hi Naush, On Fri, Jul 09, 2021 at 03:58:25PM +0100, Naushir Patuck wrote: > s/DefaultAnalogueGain/defaultAnalogueGain/ > s/DefaultExposureTime/defaultExposureTime/ > > Change these for consistency with the other static const variables. > > Signed-off-by: Naushir Patuck <naush@raspberrypi.com> > Reviewed-by: David Plowman <david.plowman@raspberrypi.com> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Thanks j > --- > src/ipa/raspberrypi/raspberrypi.cpp | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp > index 8fb98a49da63..1dd7fd68c3e9 100644 > --- a/src/ipa/raspberrypi/raspberrypi.cpp > +++ b/src/ipa/raspberrypi/raspberrypi.cpp > @@ -59,8 +59,8 @@ using namespace std::literals::chrono_literals; > using utils::Duration; > > /* Configure the sensor with these values initially. */ > -constexpr double DefaultAnalogueGain = 1.0; > -constexpr Duration DefaultExposureTime = 20.0ms; > +constexpr double defaultAnalogueGain = 1.0; > +constexpr Duration defaultExposureTime = 20.0ms; > constexpr Duration defaultMinFrameDuration = 1.0s / 30.0; > constexpr Duration defaultMaxFrameDuration = 250.0s; > > @@ -390,8 +390,8 @@ int IPARPi::configure(const IPACameraSensorInfo &sensorInfo, > /* Supply initial values for gain and exposure. */ > ControlList ctrls(sensorCtrls_); > AgcStatus agcStatus; > - agcStatus.shutter_time = DefaultExposureTime; > - agcStatus.analogue_gain = DefaultAnalogueGain; > + agcStatus.shutter_time = defaultExposureTime; > + agcStatus.analogue_gain = defaultAnalogueGain; > applyAGC(&agcStatus, ctrls); > > ASSERT(controls); > -- > 2.25.1 >
diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index 8fb98a49da63..1dd7fd68c3e9 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -59,8 +59,8 @@ using namespace std::literals::chrono_literals; using utils::Duration; /* Configure the sensor with these values initially. */ -constexpr double DefaultAnalogueGain = 1.0; -constexpr Duration DefaultExposureTime = 20.0ms; +constexpr double defaultAnalogueGain = 1.0; +constexpr Duration defaultExposureTime = 20.0ms; constexpr Duration defaultMinFrameDuration = 1.0s / 30.0; constexpr Duration defaultMaxFrameDuration = 250.0s; @@ -390,8 +390,8 @@ int IPARPi::configure(const IPACameraSensorInfo &sensorInfo, /* Supply initial values for gain and exposure. */ ControlList ctrls(sensorCtrls_); AgcStatus agcStatus; - agcStatus.shutter_time = DefaultExposureTime; - agcStatus.analogue_gain = DefaultAnalogueGain; + agcStatus.shutter_time = defaultExposureTime; + agcStatus.analogue_gain = defaultAnalogueGain; applyAGC(&agcStatus, ctrls); ASSERT(controls);