Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d3e77f9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Adjust VTS tests for zoom override latency" into udc-dev am:... 

Merge "Camera: Adjust VTS tests for zoom override latency" into udc-dev am: 29bcd80a am: 852f2772

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23371620



Change-Id: Ib3b501d63e73697be2b831ce29b0091bbf02c74c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 70d36a04 852f2772

camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp

+10 −11
Original line number Diff line number Diff line
@@ -2063,16 +2063,15 @@ TEST_P(CameraAidlTest, process10BitColorSpaceRequests) { 
TEST_P(CameraAidlTest, processZoomSettingsOverrideRequests) {

    const int32_t kFrameCount = 5;

    const int32_t kTestCases = 2;

    const bool kOverrideSequence[kTestCases][kFrameCount] = {

        // ZOOM, ZOOM, ZOOM, ZOOM, ZOOM;

    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 } };

                                                             // 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

            // Because we require at least 1 frame speed-up, request #1, #2 and #3

            // will be overridden.

            {true, true, true, false, false}};