PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: ipu3: cio2: Make use of utils::map_keys() helper

Browse Source 
Use a helper instead of local code to retrieve all keys from a map.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Niklas Söderlund
2020-07-01 21:28:33 +02:00
parent c58bec935c
commit 271d048b2d
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/libcamera/pipeline/ipu3/cio2.cpp
View File

@@ -94,11 +94,7 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)
* utils::set_overlap requires the ranges to be sorted, keep the
* cio2Codes vector sorted in ascending order.
*/
std::vector<unsigned int> cio2Codes;
cio2Codes.reserve(mbusCodesToInfo.size());
std::transform(mbusCodesToInfo.begin(), mbusCodesToInfo.end(),
std::back_inserter(cio2Codes),
[](auto &pair) { return pair.first; });
std::vector<unsigned int> cio2Codes = utils::map_keys(mbusCodesToInfo);
const std::vector<unsigned int> &sensorCodes = sensor_->mbusCodes();
if (!utils::set_overlap(sensorCodes.begin(), sensorCodes.end(),
cio2Codes.begin(), cio2Codes.end())) {
@@ -138,12 +134,7 @@ int CIO2Device::configure(const Size &size, V4L2DeviceFormat *outputFormat)
* Apply the selected format to the sensor, the CSI-2 receiver and
* the CIO2 output device.
*/
std::vector<unsigned int> mbusCodes;
mbusCodes.reserve(mbusCodesToInfo.size());
std::transform(mbusCodesToInfo.begin(), mbusCodesToInfo.end(),
std::back_inserter(mbusCodes),
[](auto &pair) { return pair.first; });
std::vector<unsigned int> mbusCodes = utils::map_keys(mbusCodesToInfo);
sensorFormat = sensor_->getFormat(mbusCodes, size);
ret = sensor_->setFormat(&sensorFormat);
if (ret)
@@ -182,11 +173,7 @@ CIO2Device::generateConfiguration(Size size) const
size = sensor_->resolution();
/* Query the sensor static information for closest match. */
std::vector<unsigned int> mbusCodes;
std::transform(mbusCodesToInfo.begin(), mbusCodesToInfo.end(),
std::back_inserter(mbusCodes),
[](auto &pair) { return pair.first; });
std::vector<unsigned int> mbusCodes = utils::map_keys(mbusCodesToInfo);
V4L2SubdeviceFormat sensorFormat = sensor_->getFormat(mbusCodes, size);
if (!sensorFormat.mbus_code) {
LOG(IPU3, Error) << "Sensor does not support mbus code";