From 54ebd0a796c3ab9975fc924eb324d48d09ad6f93 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sat, 27 Feb 2021 15:46:59 -0600 Subject: [PATCH] Fix streaming in the Android 12 emulator --- .../java/com/limelight/binding/video/MediaCodecHelper.java | 6 ++++-- 1 file changed, 4 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 6f66306e..317e51f1 100644 --- a/app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java +++ b/app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java @@ -40,6 +40,8 @@ public class MediaCodecHelper { private static final List blacklisted59FpsDecoderPrefixes; private static final List qualcommDecoderPrefixes; + public static final boolean IS_EMULATOR = Build.HARDWARE.equals("ranchu") || Build.HARDWARE.equals("cheets"); + private static boolean isLowEndSnapdragon = false; private static boolean isAdreno620 = false; private static boolean initialized = false; @@ -78,7 +80,7 @@ public class MediaCodecHelper { // Blacklist software decoders that don't support H264 high profile, // but exclude the official AOSP and CrOS emulator from this restriction. - if (!Build.HARDWARE.equals("ranchu") && !Build.HARDWARE.equals("cheets")) { + if (!IS_EMULATOR) { blacklistedDecoderPrefixes.add("omx.google"); blacklistedDecoderPrefixes.add("AVCDecoder"); } @@ -586,7 +588,7 @@ public class MediaCodecHelper { private static boolean isCodecBlacklisted(MediaCodecInfo codecInfo) { // Use the new isSoftwareOnly() function on Android Q if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - if (codecInfo.isSoftwareOnly()) { + if (!IS_EMULATOR && codecInfo.isSoftwareOnly()) { LimeLog.info("Skipping software-only decoder: "+codecInfo.getName()); return true; }