camera: intel: ipu6: control TNR by tuning data
TNR is controlled by tuning data, and default not
to run TNR when there is no control data in tuning file
BUG=b:309390470, b:309390481
TEST=emerge-nissa cros-camera-hal-intel-ipu6
Change-Id: I14b48aa6e97da571a5fa401ca0a1ff1ff2833eb3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/camera/+/4970693
Commit-Queue: Ren-Pei Zeng <kamesan@chromium.org>
Reviewed-by: Yating Wang <yating.wang@intel.corp-partner.google.com>
Tested-by: Yating Wang <yating.wang@intel.corp-partner.google.com>
Reviewed-by: Ren-Pei Zeng <kamesan@chromium.org>
diff --git a/hal/intel/ipu6/src/platformdata/CameraParser.cpp b/hal/intel/ipu6/src/platformdata/CameraParser.cpp
index 0ff609e..81cbf9e 100644
--- a/hal/intel/ipu6/src/platformdata/CameraParser.cpp
+++ b/hal/intel/ipu6/src/platformdata/CameraParser.cpp
@@ -621,7 +621,7 @@
val > 0 ? std::min(val, MAX_FACES_DETECTABLE) : MAX_FACES_DETECTABLE;
} else if (strcmp(name, "tnrExtraFrameNum") == 0) {
int val = atoi(atts[1]);
- pCurrentCam->mTnrExtraFrameNum = val > 0 ? val : DEFAULT_TNR_EXTRA_FRAME_NUM;
+ pCurrentCam->mTnrExtraFrameNum = val > 0 ? val : 0;
} else if (strcmp(name, "dummyStillSink") == 0) {
pCurrentCam->mDummyStillSink = strcmp(atts[1], "true") == 0;
} else if (strcmp(name, "useGpuTnr") == 0) {
diff --git a/hal/intel/ipu6/src/platformdata/PlatformData.h b/hal/intel/ipu6/src/platformdata/PlatformData.h
index 85dc55b..fdaa33f 100644
--- a/hal/intel/ipu6/src/platformdata/PlatformData.h
+++ b/hal/intel/ipu6/src/platformdata/PlatformData.h
@@ -56,8 +56,6 @@
#define FACE_ENGINE_INTEL_PVL 0
#define FACE_ENGINE_GOOGLE_FACESSD 1
-#define DEFAULT_TNR_EXTRA_FRAME_NUM 2
-
/* Max number of the RAW buffer number is 32.
* Max number size of the pipeline depth is 6.
* Max setting count should be larger than raw buffer number + pipeline depth.
@@ -157,7 +155,7 @@
mSwProcessingAlignWithIsp(false),
mMaxNvmDataSize(0),
mNvmOverwrittenFileSize(0),
- mTnrExtraFrameNum(DEFAULT_TNR_EXTRA_FRAME_NUM),
+ mTnrExtraFrameNum(0),
mDummyStillSink(false),
mGpuTnrEnabled(false),
mRemoveCacheFlushOutputBuffer(false),
