diff options
| -rw-r--r-- | tests/mediapc/common/src/android/mediapc/cts/common/PerformanceClassEvaluator.java | 26 | ||||
| -rw-r--r-- | tests/mediapc/src/android/mediapc/cts/CodecInitializationLatencyTest.java | 22 |
2 files changed, 16 insertions, 32 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 3cbe54a71ac..f5f7a9a899f 100644 --- a/tests/mediapc/common/src/android/mediapc/cts/common/PerformanceClassEvaluator.java +++ b/tests/mediapc/common/src/android/mediapc/cts/common/PerformanceClassEvaluator.java @@ -403,28 +403,6 @@ public class PerformanceClassEvaluator { } /** - * [2.2.7.1/5.1/H-1-8] MUST have a codec initialization latency of 50(R) / 40(S) / 30(T) - * ms or less for a 128 kbps or lower bitrate audio encoding session for all audio - * encoders when under load. Load here is defined as a concurrent 1080p to 720p - * video-only transcoding session using hardware video codecs together with the 1080p - * audio-video recording initialization. - */ - public static CodecInitLatencyRequirement createR5_1__H_1_8() { - RequiredMeasurement<Long> codec_init_latency = - RequiredMeasurement.<Long>builder().setId(RequirementConstants.CODEC_INIT_LATENCY) - .setPredicate(RequirementConstants.LONG_LTE) - .addRequiredValue(Build.VERSION_CODES.R, 50L) - .addRequiredValue(Build.VERSION_CODES.S, 40L) - .addRequiredValue(Build.VERSION_CODES.TIRAMISU, 30L) - .addRequiredValue(Build.VERSION_CODES.UPSIDE_DOWN_CAKE, 30L) - .addRequiredValue(Build.VERSION_CODES.VANILLA_ICE_CREAM, 30L) - .build(); - - return new CodecInitLatencyRequirement(RequirementConstants.R5_1__H_1_8, - codec_init_latency); - } - - /** * [2.2.7.1/5.1/H-1-12] Codec initialization latency of 40ms or less for a 1080p or * smaller video decoding session for all hardware video encoders when under load. Load * here is defined as a concurrent 1080p to 720p video-only transcoding session using @@ -2392,10 +2370,6 @@ public class PerformanceClassEvaluator { return this.addRequirement(CodecInitLatencyRequirement.createR5_1__H_1_7(mediaType)); } - public CodecInitLatencyRequirement addR5_1__H_1_8() { - return this.addRequirement(CodecInitLatencyRequirement.createR5_1__H_1_8()); - } - public ConcurrentCodecRequirement addR5_1__H_1_9_1080p() { return this.addRequirement(ConcurrentCodecRequirement.createR5_1__H_1_9_1080p()); } diff --git a/tests/mediapc/src/android/mediapc/cts/CodecInitializationLatencyTest.java b/tests/mediapc/src/android/mediapc/cts/CodecInitializationLatencyTest.java index 1948e4f4d96..3da52397a5b 100644 --- a/tests/mediapc/src/android/mediapc/cts/CodecInitializationLatencyTest.java +++ b/tests/mediapc/src/android/mediapc/cts/CodecInitializationLatencyTest.java @@ -40,6 +40,7 @@ import android.media.MediaCodecInfo; import android.media.MediaFormat; import android.media.MediaRecorder; import android.mediapc.cts.common.PerformanceClassEvaluator; +import android.mediapc.cts.common.Requirements; import android.mediapc.cts.common.Utils; import android.os.SystemClock; import android.util.Log; @@ -358,12 +359,21 @@ public class CodecInitializationLatencyTest { long initializationLatency = codecInitializationLatencyMs[percentile * count / 100]; PerformanceClassEvaluator pce = new PerformanceClassEvaluator(this.mTestName); - PerformanceClassEvaluator.CodecInitLatencyRequirement r5_1__H_1_Latency = - isEncoder ? isAudio ? pce.addR5_1__H_1_8() : pce.addR5_1__H_1_7(mMime) - : isAudio ? pce.addR5_1__H_1_13() : pce.addR5_1__H_1_12(); - - r5_1__H_1_Latency.setCodecInitLatencyMs(initializationLatency); - + if (isEncoder) { + if (isAudio) { + pce.addRequirement( + Requirements.createR5_1__H_1_8()).setCodecInitializationLatencyMs( + initializationLatency); + } else { + pce.addR5_1__H_1_7(mMime).setCodecInitLatencyMs(initializationLatency); + } + } else { + if (isAudio) { + pce.addR5_1__H_1_13().setCodecInitLatencyMs(initializationLatency); + } else { + pce.addR5_1__H_1_12().setCodecInitLatencyMs(initializationLatency); + } + } pce.submitAndCheck(); } |