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

This commit is contained in:
Treehugger Robot 2023-05-23 17:07:25 +00:00 committed by Android (Google) Code Review
commit 29bcd80ae7

View file

@ -2063,18 +2063,17 @@ 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;
{ 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
{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 } };
{true, true, true, false, false}};
for (int i = 0; i < kTestCases; i++) {
processZoomSettingsOverrideRequests(kFrameCount, kOverrideSequence[i],