diff options
| author | Chris Rosenberger <corosenberger@google.com> | 2023-06-21 17:30:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-21 17:30:54 +0000 |
| commit | 6fc5d550dbec2022f2f8e4f6c45b8371205bae1d (patch) | |
| tree | 21f728b0573d74c3f7e5e5bac3295b706620e38f | |
| parent | 09a87f82ae02eb7b9fa884447c5675262ecd4872 (diff) | |
| parent | dfa6da9003f8a800deabc5370f679392ae598baa (diff) | |
| download | cts-temp_275386652.tar.gz | |
Merge "Fixing @CddTest documentation for testAV1EncoderRequirements" am: dfa6da9003temp_275386652
Original change: https://android-review.googlesource.com/c/platform/cts/+/2631869
Change-Id: I9dc744295e9584aae0b5f5668bd0369a5877aded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/mediapc/common/src/android/mediapc/cts/common/PerformanceClassEvaluator.java | 2 | ||||
| -rw-r--r-- | tests/mediapc/src/android/mediapc/cts/VideoCodecRequirementsTest.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/mediapc/common/src/android/mediapc/cts/common/PerformanceClassEvaluator.java b/tests/mediapc/common/src/android/mediapc/cts/common/PerformanceClassEvaluator.java index 2a35322ed74..c422ead9c90 100644 --- a/tests/mediapc/common/src/android/mediapc/cts/common/PerformanceClassEvaluator.java +++ b/tests/mediapc/common/src/android/mediapc/cts/common/PerformanceClassEvaluator.java @@ -1993,7 +1993,7 @@ public class PerformanceClassEvaluator { .<Integer>builder() .setId(RequirementConstants.AV1_ENC_RESOLUTION) .setPredicate(RequirementConstants.INTEGER_GTE) - .addRequiredValue(Build.VERSION_CODES.UPSIDE_DOWN_CAKE, 720 * 480) + .addRequiredValue(Build.VERSION_CODES.UPSIDE_DOWN_CAKE, 480) .build(); RequiredMeasurement<Double> fps = RequiredMeasurement diff --git a/tests/mediapc/src/android/mediapc/cts/VideoCodecRequirementsTest.java b/tests/mediapc/src/android/mediapc/cts/VideoCodecRequirementsTest.java index 826b5f46f9f..fc5a7faade6 100644 --- a/tests/mediapc/src/android/mediapc/cts/VideoCodecRequirementsTest.java +++ b/tests/mediapc/src/android/mediapc/cts/VideoCodecRequirementsTest.java @@ -207,7 +207,7 @@ public class VideoCodecRequirementsTest { */ @SmallTest @Test(timeout = CodecTestBase.PER_TEST_TIMEOUT_SMALL_TEST_MS) - @CddTest(requirement = "2.2.7.1/5.1/H-1-19") + @CddTest(requirement = "2.2.7.1/5.1/H-1-18") public void testAV1EncoderRequirements() throws Exception { int width = 720; int height = 480; @@ -254,7 +254,7 @@ public class VideoCodecRequirementsTest { PerformanceClassEvaluator pce = new PerformanceClassEvaluator(this.mTestName); PerformanceClassEvaluator.VideoCodecRequirement rAV1EncoderReq = pce.addRAV1EncoderReq(); - rAV1EncoderReq.setAv1EncResolution(width * height); + rAV1EncoderReq.setAv1EncResolution(height); rAV1EncoderReq.setAv1EncFps(fps); rAV1EncoderReq.setAv1EncBitrate(1); pce.submitAndCheck(); |