1 files changed, 6 insertions, 5 deletions
diff --git a/tests/mediapc/src/android/mediapc/cts/VideoCodecRequirementsTest.java b/tests/mediapc/src/android/mediapc/cts/VideoCodecRequirementsTest.java
index e627ff1bdde..44f3a36e127 100644
--- a/tests/mediapc/src/android/mediapc/cts/VideoCodecRequirementsTest.java
+++ b/tests/mediapc/src/android/mediapc/cts/VideoCodecRequirementsTest.java
@@ -26,7 +26,7 @@ import static android.media.MediaFormat.MIMETYPE_VIDEO_AV1;
 import static android.mediapc.cts.CodecTestBase.SELECT_HARDWARE;
 import static android.mediapc.cts.CodecTestBase.SELECT_VIDEO;
 import static android.mediapc.cts.CodecTestBase.getCodecInfo;
-import static android.mediapc.cts.CodecTestBase.getMimesOfAvailableCodecs;
+import static android.mediapc.cts.CodecTestBase.getMediaTypesOfAvailableCodecs;
 import static android.mediapc.cts.CodecTestBase.selectCodecs;
 import static android.mediapc.cts.CodecTestBase.selectHardwareCodecs;
 
@@ -51,6 +51,8 @@ import android.media.MediaFormat;
 import android.media.MediaRecorder;
 import android.media.codec.Flags;
 import android.mediapc.cts.common.PerformanceClassEvaluator;
+import android.mediapc.cts.common.Requirements;
+import android.mediapc.cts.common.Requirements.RGBA1010102ColorFormatRequirement;
 import android.mediapc.cts.common.Utils;
 import android.platform.test.annotations.RequiresFlagsEnabled;
 import android.util.Log;
@@ -101,7 +103,7 @@ public class VideoCodecRequirementsTest {
 
     private Set<String> get4k60HwCodecSet(boolean isEncoder) throws IOException {
         Set<String> codecSet = new HashSet<>();
-        Set<String> codecMediaTypes = getMimesOfAvailableCodecs(SELECT_VIDEO, SELECT_HARDWARE);
+        Set<String> codecMediaTypes = getMediaTypesOfAvailableCodecs(SELECT_VIDEO, SELECT_HARDWARE);
         PerformancePoint PP4k60 = new PerformancePoint(3840, 2160, 60);
         for (String codecMediaType : codecMediaTypes) {
             ArrayList<String> hwVideoCodecs =
@@ -454,9 +456,8 @@ public class VideoCodecRequirementsTest {
         }
 
         PerformanceClassEvaluator pce = new PerformanceClassEvaluator(this.mTestName);
-        PerformanceClassEvaluator.VideoCodecRequirement colorFormatSupportReq =
-                pce.addColorFormatSupportReq();
-        colorFormatSupportReq.setColorFormatSupportReq(isSupported);
+        RGBA1010102ColorFormatRequirement colorFormatSupportReq = Requirements.addR5_12__H_1_2(pce);
+        colorFormatSupportReq.setRgba1010102ColorFormat(isSupported);
 
         pce.submitAndCheck();
     }