Commit faff5ec9 by olly Committed by Oliver Woodman

Add masking to correctly select renderer

Issue: #2269

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=143433012
parent 39827fad
...@@ -345,15 +345,16 @@ public abstract class MappingTrackSelector extends TrackSelector { ...@@ -345,15 +345,16 @@ public abstract class MappingTrackSelector extends TrackSelector {
private static int findRenderer(RendererCapabilities[] rendererCapabilities, TrackGroup group) private static int findRenderer(RendererCapabilities[] rendererCapabilities, TrackGroup group)
throws ExoPlaybackException { throws ExoPlaybackException {
int bestRendererIndex = rendererCapabilities.length; int bestRendererIndex = rendererCapabilities.length;
int bestSupportLevel = RendererCapabilities.FORMAT_UNSUPPORTED_TYPE; int bestFormatSupportLevel = RendererCapabilities.FORMAT_UNSUPPORTED_TYPE;
for (int rendererIndex = 0; rendererIndex < rendererCapabilities.length; rendererIndex++) { for (int rendererIndex = 0; rendererIndex < rendererCapabilities.length; rendererIndex++) {
RendererCapabilities rendererCapability = rendererCapabilities[rendererIndex]; RendererCapabilities rendererCapability = rendererCapabilities[rendererIndex];
for (int trackIndex = 0; trackIndex < group.length; trackIndex++) { for (int trackIndex = 0; trackIndex < group.length; trackIndex++) {
int trackSupportLevel = rendererCapability.supportsFormat(group.getFormat(trackIndex)); int formatSupportLevel = rendererCapability.supportsFormat(group.getFormat(trackIndex))
if (trackSupportLevel > bestSupportLevel) { & RendererCapabilities.FORMAT_SUPPORT_MASK;
if (formatSupportLevel > bestFormatSupportLevel) {
bestRendererIndex = rendererIndex; bestRendererIndex = rendererIndex;
bestSupportLevel = trackSupportLevel; bestFormatSupportLevel = formatSupportLevel;
if (bestSupportLevel == RendererCapabilities.FORMAT_HANDLED) { if (bestFormatSupportLevel == RendererCapabilities.FORMAT_HANDLED) {
// We can't do better. // We can't do better.
return bestRendererIndex; return bestRendererIndex;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment