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

libipa: agc_mean_luminance: Rename yaml key from exposure-time to exposureTime

Browse source 
In d0478c41f4 ("libcamera: Rename "shutter speed" to "exposure time"")
the tuning file entry "shutter" was renamed to "exposure-time". As the
tuning files use camel cased key names, change "exposure-time" to
"exposureTime" for consistency. It doesn't break our users setups as
there are no tuning files using that entry in the wild (at least
officially).

Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Stefan Klug 2024-12-04 11:21:17 +01:00
parent cf0c56f7e0
commit 9fc86dc02a
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ipa/libipa/agc_mean_luminance.cpp
View file

@ -248,7 +248,7 @@ int AgcMeanLuminance::parseExposureModes(const YamlObject &tuningData)
} }
std::vector<uint32_t> exposureTimes = std::vector<uint32_t> exposureTimes =
modeValues["exposure-time"].getList<uint32_t>().value_or(std::vector<uint32_t>{}); modeValues["exposureTime"].getList<uint32_t>().value_or(std::vector<uint32_t>{});
std::vector<double> gains = std::vector<double> gains =
modeValues["gain"].getList<double>().value_or(std::vector<double>{}); modeValues["gain"].getList<double>().value_or(std::vector<double>{});
@ -338,7 +338,7 @@ int AgcMeanLuminance::parseExposureModes(const YamlObject &tuningData)
* For the AeExposureMode control the data should contain a dictionary called * For the AeExposureMode control the data should contain a dictionary called
* AeExposureMode containing per-mode setting dictionaries with the key being a * AeExposureMode containing per-mode setting dictionaries with the key being a
* value from \ref controls::AeExposureModeNameValueMap. Each mode dict should * value from \ref controls::AeExposureModeNameValueMap. Each mode dict should
* contain an array of exposure times with the key "exposure-time" and an array * contain an array of exposure times with the key "exposureTime" and an array
* of gain values with the key "gain", in this format: * of gain values with the key "gain", in this format:
* *
* \code{.unparsed} * \code{.unparsed}
@ -346,10 +346,10 @@ int AgcMeanLuminance::parseExposureModes(const YamlObject &tuningData)
* - Agc: * - Agc:
* AeExposureMode: * AeExposureMode:
* ExposureNormal: * ExposureNormal:
* exposure-time: [ 100, 10000, 30000, 60000, 120000 ] * exposureTime: [ 100, 10000, 30000, 60000, 120000 ]
* gain: [ 2.0, 4.0, 6.0, 8.0, 10.0 ] * gain: [ 2.0, 4.0, 6.0, 8.0, 10.0 ]
* ExposureShort: * ExposureShort:
* exposure-time: [ 100, 10000, 30000, 60000, 120000 ] * exposureTime: [ 100, 10000, 30000, 60000, 120000 ]
* gain: [ 2.0, 4.0, 6.0, 8.0, 10.0 ] * gain: [ 2.0, 4.0, 6.0, 8.0, 10.0 ]
* *
* \endcode * \endcode

4
utils/tuning/libtuning/modules/agc/rkisp1.py
View file

@ -47,9 +47,9 @@ class AGCRkISP1(AGC):
} }
def _generate_exposure_modes(self) -> dict: def _generate_exposure_modes(self) -> dict:
normal = {'exposure-time': [100, 10000, 30000, 60000, 120000], normal = {'exposureTime': [100, 10000, 30000, 60000, 120000],
'gain': [2.0, 4.0, 6.0, 6.0, 6.0]} 'gain': [2.0, 4.0, 6.0, 6.0, 6.0]}
short = {'exposure-time': [100, 5000, 10000, 20000, 120000], short = {'exposureTime': [100, 5000, 10000, 20000, 120000],
'gain': [2.0, 4.0, 6.0, 6.0, 6.0]} 'gain': [2.0, 4.0, 6.0, 6.0, 6.0]}
return {'ExposureNormal': normal, 'ExposureShort': short} return {'ExposureNormal': normal, 'ExposureShort': short}