Camera: Adjust VTS tests for zoom override latency
Now that the zoom override latency requirement is reduced to 1 frame,
adjust the VTS test accordingly.
Test: Run VtsAidlHalCameraProvider_TargetTest on Pixel
Bug: 283196724
Change-Id: Ie05106cd79549de6b91f94b5c25ffae768982a1b
diff --git a/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp b/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp
index f8d301f..aee5366 100644
--- a/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp
+++ b/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp
@@ -2063,18 +2063,17 @@
TEST_P(CameraAidlTest, processZoomSettingsOverrideRequests) {
const int32_t kFrameCount = 5;
const int32_t kTestCases = 2;
- const bool kOverrideSequence[kTestCases][kFrameCount] = {
- // ZOOM, ZOOM, ZOOM, ZOOM, ZOOM;
- { true, true, true, true, true },
- // OFF, OFF, ZOOM, ZOOM, OFF;
- { false, false, true, true, false } };
+ const bool kOverrideSequence[kTestCases][kFrameCount] = {// ZOOM, ZOOM, ZOOM, ZOOM, ZOOM;
+ {true, true, true, true, true},
+ // OFF, ZOOM, ZOOM, ZOOM, OFF;
+ {false, true, true, true, false}};
const bool kExpectedOverrideResults[kTestCases][kFrameCount] = {
- // All resuls should be overridden except the last one. The last result's
- // zoom doesn't have speed-up.
- { true, true, true, true, false },
- // Because we require at least 2 frames speed-up, request #1, #2 and #3
- // will be overridden.
- { true, true, true, false, false } };
+ // All resuls should be overridden except the last one. The last result's
+ // zoom doesn't have speed-up.
+ {true, true, true, true, false},
+ // Because we require at least 1 frame speed-up, request #1, #2 and #3
+ // will be overridden.
+ {true, true, true, false, false}};
for (int i = 0; i < kTestCases; i++) {
processZoomSettingsOverrideRequests(kFrameCount, kOverrideSequence[i],