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 737bf08314)
This commit is contained in:
tonihei 2024-03-26 08:38:31 -07:00 committed by SheenaChhabra
parent 88ebc89da2
commit a5d0cb51bc

View file

@ -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.