sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-13 12:35:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added max video size selection to DefaultTrackSelectionPolicy.

Browse source 
It is possible to add use of this feature in the demo app, restricting the selected
tracks to the viewport size. But it should be added in a future CL.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=123965232
This commit is contained in:
aquilescanta 2016-06-03 07:02:19 -07:00 committed by Oliver Woodman
parent ebd37cfb8e
commit 6fd610fc5f
2 changed files with 56 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
library/src/main/java/com/google/android/exoplayer/DefaultTrackSelectionPolicy.java
View file

@ -27,9 +27,13 @@ public class DefaultTrackSelectionPolicy extends TrackSelectionPolicy {
private String preferredLanguage;
private boolean allowMixedMimeAdaptiveness;
private boolean allowNonSeamlessAdaptiveness;
private int maxVideoWidth;
private int maxVideoHeight;
public DefaultTrackSelectionPolicy() {
allowNonSeamlessAdaptiveness = true;
maxVideoWidth = Integer.MAX_VALUE;
maxVideoHeight = Integer.MAX_VALUE;
}
public void setPreferredLanguage(String preferredLanguage) {
@ -53,6 +57,14 @@ public class DefaultTrackSelectionPolicy extends TrackSelectionPolicy {
}
}
public void setMaxVideoSize(int maxVideoWidth, int maxVideoHeight) {
if (this.maxVideoWidth != maxVideoWidth || this.maxVideoHeight != maxVideoHeight) {
this.maxVideoWidth = maxVideoWidth;
this.maxVideoHeight = maxVideoHeight;
invalidate();
}
}
@Override
public TrackSelection[] selectTracks(TrackRenderer[] renderers,
TrackGroupArray[] rendererTrackGroupArrays, int[][][] rendererFormatSupports)
@ -63,8 +75,7 @@ public class DefaultTrackSelectionPolicy extends TrackSelectionPolicy {
switch (renderers[i].getTrackType()) {
case C.TRACK_TYPE_VIDEO:
rendererTrackSelections[i] = selectTrackForVideoRenderer(renderers[i],
rendererTrackGroupArrays[i], rendererFormatSupports[i], allowMixedMimeAdaptiveness,
allowNonSeamlessAdaptiveness);
rendererTrackGroupArrays[i], rendererFormatSupports[i]);
break;
case C.TRACK_TYPE_AUDIO:
rendererTrackSelections[i] = selectTrackForAudioRenderer(rendererTrackGroupArrays[i],
@ -83,9 +94,8 @@ public class DefaultTrackSelectionPolicy extends TrackSelectionPolicy {
return rendererTrackSelections;
}
private static TrackSelection selectTrackForVideoRenderer(TrackRenderer renderer,
TrackGroupArray trackGroups, int[][] formatSupport, boolean allowMixedMimeAdaptiveness,
boolean allowNonSeamlessAdaptiveness) throws ExoPlaybackException {
private TrackSelection selectTrackForVideoRenderer(TrackRenderer renderer,
TrackGroupArray trackGroups, int[][] formatSupport) throws ExoPlaybackException {
int requiredAdaptiveSupport = allowNonSeamlessAdaptiveness
? TrackRenderer.ADAPTIVE_NOT_SEAMLESS | TrackRenderer.ADAPTIVE_SEAMLESS
: TrackRenderer.ADAPTIVE_SEAMLESS;
@ -95,7 +105,7 @@ public class DefaultTrackSelectionPolicy extends TrackSelectionPolicy {
int[] largestAdaptiveGroupTracks = NO_TRACKS;
for (int i = 0; i < trackGroups.length; i++) {
int[] adaptiveTracks = getAdaptiveTracksOfGroup(trackGroups.get(i), formatSupport[i],
allowMixedMimeTypes, requiredAdaptiveSupport);
allowMixedMimeTypes, requiredAdaptiveSupport, maxVideoWidth, maxVideoHeight);
if (adaptiveTracks.length > largestAdaptiveGroupTracks.length) {
largestAdaptiveGroup = i;
largestAdaptiveGroupTracks = adaptiveTracks;
@ -104,11 +114,24 @@ public class DefaultTrackSelectionPolicy extends TrackSelectionPolicy {
if (largestAdaptiveGroup != -1) {
return new TrackSelection(largestAdaptiveGroup, largestAdaptiveGroupTracks);
}
return selectFirstSupportedTrack(trackGroups, formatSupport);
// No adaptive tracks selection could be made, so we select the first supported video track.
for (int groupIndex = 0; groupIndex < trackGroups.length; groupIndex++) {
TrackGroup trackGroup = trackGroups.get(groupIndex);
int[] trackFormatSupport = formatSupport[groupIndex];
for (int trackIndex = 0; trackIndex < trackGroup.length; trackIndex++) {
if (isSupportedVideoTrack(trackFormatSupport[trackIndex], trackGroup.getFormat(trackIndex),
maxVideoWidth, maxVideoHeight)) {
return new TrackSelection(groupIndex, trackIndex);
}
}
}
return null;
}
private static int[] getAdaptiveTracksOfGroup(TrackGroup trackGroup, int[] formatSupport,
boolean allowMixedMimeTypes, int requiredAdaptiveSupport) {
boolean allowMixedMimeTypes, int requiredAdaptiveSupport, int maxVideoWidth,
int maxVideoHeight) {
if (!trackGroup.adaptive) {
return NO_TRACKS;
}
@ -116,13 +139,14 @@ public class DefaultTrackSelectionPolicy extends TrackSelectionPolicy {
String mimeType = null;
int adaptiveTracksCount = 0;
if (allowMixedMimeTypes) {
adaptiveTracksCount = getSupportedTrackCountForMimeType(trackGroup, formatSupport,
requiredAdaptiveSupport, mimeType);
adaptiveTracksCount = getAdaptiveTrackCountForMimeType(trackGroup, formatSupport,
requiredAdaptiveSupport, mimeType, maxVideoWidth, maxVideoHeight);
} else {
for (int i = 0; i < trackGroup.length; i++) {
if (!Util.areEqual(mimeType, trackGroup.getFormat(i).sampleMimeType)) {
int countForMimeType = getSupportedTrackCountForMimeType(trackGroup, formatSupport,
requiredAdaptiveSupport, trackGroup.getFormat(i).sampleMimeType);
int countForMimeType = getAdaptiveTrackCountForMimeType(trackGroup, formatSupport,
requiredAdaptiveSupport, trackGroup.getFormat(i).sampleMimeType, maxVideoWidth,
maxVideoHeight);
if (countForMimeType > adaptiveTracksCount) {
adaptiveTracksCount = countForMimeType;
mimeType = trackGroup.getFormat(i).sampleMimeType;
@ -138,30 +162,31 @@ public class DefaultTrackSelectionPolicy extends TrackSelectionPolicy {
int[] adaptiveTracks = new int[adaptiveTracksCount];
adaptiveTracksCount = 0;
for (int i = 0; i < trackGroup.length; i++) {
if (isAdaptiveTrack(trackGroup.getFormat(i).sampleMimeType, mimeType, formatSupport[i],
requiredAdaptiveSupport)) {
if (isAdaptiveTrack(trackGroup.getFormat(i), mimeType, formatSupport[i],
requiredAdaptiveSupport, maxVideoWidth, maxVideoHeight)) {
adaptiveTracks[adaptiveTracksCount++] = i;
}
}
return adaptiveTracks;
}
private static int getSupportedTrackCountForMimeType(TrackGroup trackGroup, int[] formatSupport,
int requiredAdaptiveSupport, String mimeType) {
private static int getAdaptiveTrackCountForMimeType(TrackGroup trackGroup, int[] formatSupport,
int requiredAdaptiveSupport, String mimeType, int maxVideoWidth, int maxVideoHeight) {
int adaptiveTracksCount = 0;
for (int i = 0; i < trackGroup.length; i++) {
if (isAdaptiveTrack(trackGroup.getFormat(i).sampleMimeType, mimeType, formatSupport[i],
requiredAdaptiveSupport)) {
if (isAdaptiveTrack(trackGroup.getFormat(i), mimeType, formatSupport[i],
requiredAdaptiveSupport, maxVideoWidth, maxVideoHeight)) {
adaptiveTracksCount++;
}
}
return adaptiveTracksCount;
}
private static boolean isAdaptiveTrack(String trackMimeType, String mimeType, int formatSupport,
int requiredAdaptiveSupport) {
return isSupported(formatSupport) && (formatSupport & requiredAdaptiveSupport) != 0
&& (mimeType == null || Util.areEqual(trackMimeType, mimeType));
private static boolean isAdaptiveTrack(Format format, String mimeType, int formatSupport,
int requiredAdaptiveSupport, int maxVideoWidth, int maxVideoHeight) {
return isSupportedVideoTrack(formatSupport, format, maxVideoWidth, maxVideoHeight)
&& (formatSupport & requiredAdaptiveSupport) != 0
&& (mimeType == null || Util.areEqual(format.sampleMimeType, mimeType));
}
private static TrackSelection selectTrackForTextRenderer(TrackGroupArray trackGroups,
@ -221,6 +246,12 @@ public class DefaultTrackSelectionPolicy extends TrackSelectionPolicy {
return selectFirstSupportedTrack(trackGroups, formatSupport);
}
private static boolean isSupportedVideoTrack(int formatSupport, Format format, int maxVideoWidth,
int maxVideoHeight) {
return isSupported(formatSupport) && format.width <= maxVideoWidth
&& format.height <= maxVideoHeight;
}
private static boolean isSupported(int formatSupport) {
return (formatSupport & TrackRenderer.FORMAT_SUPPORT_MASK) == TrackRenderer.FORMAT_HANDLED;
}

4
library/src/main/java/com/google/android/exoplayer/TrackSelectionPolicy.java
View file

@ -39,7 +39,9 @@ public abstract class TrackSelectionPolicy {
* selections.
*/
protected void invalidate() {
listener.invalidatePolicySelections();
if (listener != null) {
listener.invalidatePolicySelections();
}
}
/**