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

libcamera: ipa_manager: Re-arrange IPA precedence

Browse Source 
Setting a user environment path in LIBCAMERA_IPA_MODULE_PATH should take
precedence over the system loading locations.

Adjust the IPA search orders accordingly.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Kieran Bingham
2020-02-20 14:47:08 +00:00
parent a15e8d92ea
commit 7860977710
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcamera/ipa_manager.cpp
+19 -19
View File
@@ -98,31 +98,31 @@ IPAManager::IPAManager()
unsigned int ipaCount = 0;
int ret;
/* User-specified paths take precedence. */
const char *modulePaths = utils::secure_getenv("LIBCAMERA_IPA_MODULE_PATH");
if (modulePaths) {
for (const auto &dir : utils::split(modulePaths, ":")) {
if (dir.empty())
continue;
int ret = addDir(dir.c_str());
if (ret > 0)
ipaCount += ret;
}
if (!ipaCount)
LOG(IPAManager, Warning)
<< "No IPA found in '" << modulePaths << "'";
}
/* Load IPAs from the installed system path. */
ret = addDir(IPA_MODULE_DIR);
if (ret > 0)
ipaCount += ret;
const char *modulePaths = utils::secure_getenv("LIBCAMERA_IPA_MODULE_PATH");
if (!modulePaths) {
if (!ipaCount)
LOG(IPAManager, Warning)
<< "No IPA found in '" IPA_MODULE_DIR "'";
return;
}
for (const auto &dir : utils::split(modulePaths, ":")) {
if (dir.empty())
continue;
int ret = addDir(dir.c_str());
if (ret > 0)
ipaCount += ret;
}
if (!ipaCount)
LOG(IPAManager, Warning)
<< "No IPA found in '" IPA_MODULE_DIR "' and '"
<< modulePaths << "'";
<< "No IPA found in '" IPA_MODULE_DIR "'";
}
IPAManager::~IPAManager()