camera: intel: ipu6: Fix CTS case testYuvBurst fail issue
Apply tnr restart threshold in burst capture mode, this fixes
burst YUV capture where CTS requires consistent frame durations
at minimum.
BUG=b:188113146,b:186396574
TEST=Full tested pass for camera functions.
Change-Id: I682eee383e486f21f74c350a1ee27a999c4366b9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/camera/+/2994815
Reviewed-by: Hung-yu Wu <hywu@chromium.org>
Reviewed-by: Ren-Pei Zeng <kamesan@chromium.org>
Reviewed-by: Yating Wang <yating.wang@intel.corp-partner.google.com>
Tested-by: Ren-Pei Zeng <kamesan@chromium.org>
Commit-Queue: Ren-Pei Zeng <kamesan@chromium.org>
(cherry picked from commit 482d1baabde3d47ec1d6813399196576643b50e3)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/camera/+/3002427
diff --git a/hal/intel/ipu6/src/core/PSysProcessor.cpp b/hal/intel/ipu6/src/core/PSysProcessor.cpp
index 64b716e..3e7a04f 100644
--- a/hal/intel/ipu6/src/core/PSysProcessor.cpp
+++ b/hal/intel/ipu6/src/core/PSysProcessor.cpp
@@ -794,7 +794,9 @@
mHoldRawBuffers, mLastStillTnrSequence, hasStill);
bool bypass = mPSysDAGs[mCurConfigMode]->isBypassStillTnr(sequence);
- if (!bypass && hasStill && sequence != (mLastStillTnrSequence + 1) && mHoldRawBuffers) {
+ if (!bypass && hasStill && mHoldRawBuffers &&
+ (sequence >= (mLastStillTnrSequence + TNR7US_RESTART_THRESHOLD) ||
+ mLastStillTnrSequence < 0)) {
CameraBufferPortMap fakeTaskBuffers = *dstBuffers;
for (const auto& item : fakeTaskBuffers) {
if (item.second && item.second->getStreamUsage() != CAMERA_STREAM_STILL_CAPTURE) {
diff --git a/hal/intel/ipu6/src/core/psysprocessor/GPUExecutor.cpp b/hal/intel/ipu6/src/core/psysprocessor/GPUExecutor.cpp
index db42b09..601c20b 100644
--- a/hal/intel/ipu6/src/core/psysprocessor/GPUExecutor.cpp
+++ b/hal/intel/ipu6/src/core/psysprocessor/GPUExecutor.cpp
@@ -48,7 +48,6 @@
#define STILL_TNR_THRESHOLD_GAIN_ID 722
#define DEFAULT_TNR_THRESHOLD_GAIN 2.0f
-#define TNR7US_RESTART_THRESHOLD 5
std::mutex GPUExecutor::mGPULock;
diff --git a/hal/intel/ipu6/src/platformdata/PlatformData.h b/hal/intel/ipu6/src/platformdata/PlatformData.h
index c48321f..4ad0850 100644
--- a/hal/intel/ipu6/src/platformdata/PlatformData.h
+++ b/hal/intel/ipu6/src/platformdata/PlatformData.h
@@ -67,6 +67,8 @@
#define CAMERA_GRAPH_DESCRIPTOR_FILE "gcss/graph_descriptor.xml"
#define CAMERA_GRAPH_SETTINGS_DIR "gcss/"
+#define TNR7US_RESTART_THRESHOLD 5
+
class GraphConfigNodes;
class PlatformData {
private: