From c821c4684f30f3c6be9fa8162cc4b356f7551ddd Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Tue, 15 Oct 2019 00:11:14 -0700 Subject: [PATCH] Allow FFmpeg decoders on Android x86. Closes #630 --- .../com/limelight/binding/video/MediaCodecHelper.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java b/app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java index 28393f61..2981ec0d 100644 --- a/app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java +++ b/app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java @@ -77,8 +77,12 @@ public class MediaCodecHelper { blacklistedDecoderPrefixes.add("AVCDecoder"); } - // Never use ffmpeg decoders since they're software decoders - blacklistedDecoderPrefixes.add("OMX.ffmpeg"); + // We want to avoid ffmpeg decoders since they're software decoders, + // but on Android-x86 they might be all we have (and also relatively + // performant on a modern x86 processor). + if (!Build.BRAND.equals("Android-x86")) { + blacklistedDecoderPrefixes.add("OMX.ffmpeg"); + } // Force these decoders disabled because: // 1) They are software decoders, so the performance is terrible