commit 36eda434192b09ee1e371d0c6d10528f6b129cc5
author Tianshu Qiu <tian.shu.qiu@intel.com> Fri Nov 04 09:55:13 2022 +0800
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Nov 04 12:36:04 2022 +0000
tree 6e8d5c0c907f27630786e1ec8a0c623aefc48d01
parent a4efefaea5f6921b4973199705b314ef1c5067bd

camera: intel: ipu6: Fix metadata issue for multiple modules support

BUG=b:257051381, b:255896956, b:257050317
TEST=Full tested pass for camera functions

Change-Id: Id04c2a255e97fe5c07449283ebb86cc59e17f4e1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/camera/+/4003444
Reviewed-by: Tian Shu Qiu <tian.shu.qiu@intel.com>
Tested-by: Zong Li <zong.li@intel.corp-partner.google.com>
Commit-Queue: Ren-Pei Zeng <kamesan@chromium.org>
Reviewed-by: Zong Li <zong.li@intel.corp-partner.google.com>
Reviewed-by: Ren-Pei Zeng <kamesan@chromium.org>
Reviewed-by: Jie J Zhang <jie.j.zhang@intel.corp-partner.google.com>

hal/intel/ipu6/src/platformdata/PlatformData.cpp

diff --git a/hal/intel/ipu6/src/platformdata/PlatformData.cpp b/hal/intel/ipu6/src/platformdata/PlatformData.cpp
index 6aee1af..5676c4a 100644
--- a/hal/intel/ipu6/src/platformdata/PlatformData.cpp
+++ b/hal/intel/ipu6/src/platformdata/PlatformData.cpp
@@ -92,11 +92,11 @@
 
     StaticCfg* staticCfg = &(getInstance()->mStaticCfg);
     for (size_t i = 0; i < staticCfg->mCameras.size(); i++) {
-        std::string camModuleName;
+        const std::string& camModuleName = staticCfg->mCameras[i].mCamModuleName;
         AiqInitData* aiqInitData = new AiqInitData(
             staticCfg->mCameras[i].sensorName, getCameraCfgPath(),
             staticCfg->mCameras[i].mSupportedTuningConfig, staticCfg->mCameras[i].mNvmDirectory,
-            staticCfg->mCameras[i].mMaxNvmDataSize, staticCfg->mCameras[i].mCamModuleName);
+            staticCfg->mCameras[i].mMaxNvmDataSize, camModuleName);
         getInstance()->mAiqInitData.push_back(aiqInitData);
 
         if (!camModuleName.empty() &&