moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-19 19:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure MediaCodecHelper is initialized before evaluating codecs

Browse Source
This commit is contained in:
Cameron Gutman 2017-11-21 19:27:08 -08:00
parent a56689aea3
commit bfa5a6349e
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java
View File

@ -38,6 +38,7 @@ public class MediaCodecHelper {
private static final List<String> refFrameInvalidationHevcPrefixes; private static final List<String> refFrameInvalidationHevcPrefixes;
private static boolean isLowEndSnapdragon = false; private static boolean isLowEndSnapdragon = false;
private static boolean initialized = false;
static { static {
directSubmitPrefixes = new LinkedList<>(); directSubmitPrefixes = new LinkedList<>();
@ -171,6 +172,10 @@ public class MediaCodecHelper {
} }
public static void initialize(Context context, String glRenderer) { public static void initialize(Context context, String glRenderer) {
if (initialized) {
return;
}
ActivityManager activityManager = ActivityManager activityManager =
(ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
ConfigurationInfo configInfo = activityManager.getDeviceConfigurationInfo(); ConfigurationInfo configInfo = activityManager.getDeviceConfigurationInfo();
@ -214,9 +219,15 @@ public class MediaCodecHelper {
blacklistedDecoderPrefixes.add("OMX.qcom.video.decoder.hevc"); blacklistedDecoderPrefixes.add("OMX.qcom.video.decoder.hevc");
} }
} }
initialized = true;
} }
private static boolean isDecoderInList(List<String> decoderList, String decoderName) { private static boolean isDecoderInList(List<String> decoderList, String decoderName) {
if (!initialized) {
throw new IllegalStateException("MediaCodecHelper must be initialized before use");
}
for (String badPrefix : decoderList) { for (String badPrefix : decoderList) {
if (decoderName.length() >= badPrefix.length()) { if (decoderName.length() >= badPrefix.length()) {
String prefix = decoderName.substring(0, badPrefix.length()); String prefix = decoderName.substring(0, badPrefix.length());
@ -373,6 +384,10 @@ public class MediaCodecHelper {
// This is a different algorithm than the other findXXXDecoder functions, // This is a different algorithm than the other findXXXDecoder functions,
// because we want to evaluate the decoders in our list's order // because we want to evaluate the decoders in our list's order
// rather than MediaCodecList's order // rather than MediaCodecList's order
if (!initialized) {
throw new IllegalStateException("MediaCodecHelper must be initialized before use");
}
for (String preferredDecoder : preferredDecoders) { for (String preferredDecoder : preferredDecoders) {
for (MediaCodecInfo codecInfo : getMediaCodecList()) { for (MediaCodecInfo codecInfo : getMediaCodecList()) {

4
app/src/main/java/com/limelight/preferences/StreamSettings.java
View File

@ -134,6 +134,10 @@ public class StreamSettings extends Activity {
} }
} }
// This must be called to do runtime initialization before calling functions that evaluate
// decoder lists.
MediaCodecHelper.initialize(getContext(), GlPreferences.readPreferences(getContext()).glRenderer);
MediaCodecInfo avcDecoder = MediaCodecHelper.findProbableSafeDecoder("video/avc", -1); MediaCodecInfo avcDecoder = MediaCodecHelper.findProbableSafeDecoder("video/avc", -1);
MediaCodecInfo hevcDecoder = MediaCodecHelper.findProbableSafeDecoder("video/hevc", -1); MediaCodecInfo hevcDecoder = MediaCodecHelper.findProbableSafeDecoder("video/hevc", -1);