From 192cdc66a2ba13292f3cfd7090dc8c810302e53f Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Mon, 27 Oct 2014 11:00:04 +0000 Subject: [PATCH] Ignore secure decoders. They shouldn't be explicitly listed. --- .../java/com/google/android/exoplayer/MediaCodecUtil.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java b/library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java index 31ec2ae9f1..9da62a59d2 100644 --- a/library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java +++ b/library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java @@ -76,7 +76,7 @@ public class MediaCodecUtil { for (int i = 0; i < numberOfCodecs; i++) { MediaCodecInfo info = MediaCodecList.getCodecInfoAt(i); String codecName = info.getName(); - if (!info.isEncoder() && isOmxCodec(codecName)) { + if (!info.isEncoder() && codecName.startsWith("OMX.") && !codecName.endsWith(".secure")) { String[] supportedTypes = info.getSupportedTypes(); for (int j = 0; j < supportedTypes.length; j++) { String supportedType = supportedTypes[j]; @@ -91,10 +91,6 @@ public class MediaCodecUtil { return null; } - private static boolean isOmxCodec(String name) { - return name.startsWith("OMX."); - } - private static boolean isAdaptive(CodecCapabilities capabilities) { if (Util.SDK_INT >= 19) { return isAdaptiveV19(capabilities);