From a5d0cb51bc837d2481aa42e1610cea3524a169bc Mon Sep 17 00:00:00 2001 From: tonihei Date: Tue, 26 Mar 2024 08:38:31 -0700 Subject: [PATCH] Don't apply performance point workaround from API 35 The workaround check is now part of CTS and we should be able to rely on the PerformancePoints values (or at least can be sure that they cover all CDD requirements) #minor-release PiperOrigin-RevId: 619201331 (cherry picked from commit 737bf08314a5d1c27762aa1c501d3e132a138e20) --- .../MediaCodecPerformancePointCoverageProvider.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecPerformancePointCoverageProvider.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecPerformancePointCoverageProvider.java index 9529e39e2d..9ea923fc1e 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecPerformancePointCoverageProvider.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecPerformancePointCoverageProvider.java @@ -135,6 +135,10 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; * Checks if the CDD-requirement to support H264 720p at 60 fps is covered by PerformancePoints. */ private static boolean shouldIgnorePerformancePoints() { + if (Util.SDK_INT >= 35) { + // The same check as below is tested in CTS and we should get reliable results from API 35. + return false; + } try { Format formatH264 = new Format.Builder().setSampleMimeType(MimeTypes.VIDEO_H264).build(); // Null check required to pass RequiresNonNull annotation on getDecoderInfosSoftMatch.