loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-17 12:39:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4801 from nicklasl/trackselector-filter-on-framerate

Browse Source 
Trackselector filter on framerate
This commit is contained in:
ojw28 2018-09-20 12:40:13 +01:00 committed by GitHub
commit 2a235184c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
View File

@ -181,6 +181,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
private int viewportHeight; private int viewportHeight;
private boolean viewportOrientationMayChange; private boolean viewportOrientationMayChange;
private int tunnelingAudioSessionId; private int tunnelingAudioSessionId;
private int maxFrameRate;
/** Creates a builder with default initial values. */ /** Creates a builder with default initial values. */
public ParametersBuilder() { public ParametersBuilder() {
@ -211,6 +212,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
viewportHeight = initialValues.viewportHeight; viewportHeight = initialValues.viewportHeight;
viewportOrientationMayChange = initialValues.viewportOrientationMayChange; viewportOrientationMayChange = initialValues.viewportOrientationMayChange;
tunnelingAudioSessionId = initialValues.tunnelingAudioSessionId; tunnelingAudioSessionId = initialValues.tunnelingAudioSessionId;
maxFrameRate = initialValues.maxFrameRate;
} }
/** /**
@ -521,6 +523,16 @@ public class DefaultTrackSelector extends MappingTrackSelector {
return this; return this;
} }
/**
* See {@link Parameters#maxFrameRate}.
*
* @return This builder.
*/
public ParametersBuilder setMaxFrameRate(int maxFrameRate) {
this.maxFrameRate = maxFrameRate;
return this;
}
/** /**
* Builds a {@link Parameters} instance with the selected values. * Builds a {@link Parameters} instance with the selected values.
*/ */
@ -544,7 +556,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
viewportWidth, viewportWidth,
viewportHeight, viewportHeight,
viewportOrientationMayChange, viewportOrientationMayChange,
tunnelingAudioSessionId); tunnelingAudioSessionId,
maxFrameRate);
} }
private static SparseArray<Map<TrackGroupArray, SelectionOverride>> cloneSelectionOverrides( private static SparseArray<Map<TrackGroupArray, SelectionOverride>> cloneSelectionOverrides(
@ -641,6 +654,10 @@ public class DefaultTrackSelector extends MappingTrackSelector {
* The default value is {@code true}. * The default value is {@code true}.
*/ */
public final boolean viewportOrientationMayChange; public final boolean viewportOrientationMayChange;
/**
* Maximum video frame rate. The default value is {@link Integer#MAX_VALUE} (i.e. no constraint).
*/
public final int maxFrameRate;
// General // General
/** /**
@ -700,7 +717,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
/* viewportWidth= */ Integer.MAX_VALUE, /* viewportWidth= */ Integer.MAX_VALUE,
/* viewportHeight= */ Integer.MAX_VALUE, /* viewportHeight= */ Integer.MAX_VALUE,
/* viewportOrientationMayChange= */ true, /* viewportOrientationMayChange= */ true,
/* tunnelingAudioSessionId= */ C.AUDIO_SESSION_ID_UNSET); /* tunnelingAudioSessionId= */ C.AUDIO_SESSION_ID_UNSET,
/* maxFrameRate= */ Integer.MAX_VALUE);
} }
/* package */ Parameters( /* package */ Parameters(
@ -722,7 +740,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
int viewportWidth, int viewportWidth,
int viewportHeight, int viewportHeight,
boolean viewportOrientationMayChange, boolean viewportOrientationMayChange,
int tunnelingAudioSessionId) { int tunnelingAudioSessionId,
int maxFrameRate) {
this.selectionOverrides = selectionOverrides; this.selectionOverrides = selectionOverrides;
this.rendererDisabledFlags = rendererDisabledFlags; this.rendererDisabledFlags = rendererDisabledFlags;
this.preferredAudioLanguage = Util.normalizeLanguageCode(preferredAudioLanguage); this.preferredAudioLanguage = Util.normalizeLanguageCode(preferredAudioLanguage);
@ -742,6 +761,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
this.viewportHeight = viewportHeight; this.viewportHeight = viewportHeight;
this.viewportOrientationMayChange = viewportOrientationMayChange; this.viewportOrientationMayChange = viewportOrientationMayChange;
this.tunnelingAudioSessionId = tunnelingAudioSessionId; this.tunnelingAudioSessionId = tunnelingAudioSessionId;
this.maxFrameRate = maxFrameRate;
} }
/* package */ Parameters(Parcel in) { /* package */ Parameters(Parcel in) {
@ -764,6 +784,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
this.viewportHeight = in.readInt(); this.viewportHeight = in.readInt();
this.viewportOrientationMayChange = Util.readBoolean(in); this.viewportOrientationMayChange = Util.readBoolean(in);
this.tunnelingAudioSessionId = in.readInt(); this.tunnelingAudioSessionId = in.readInt();
this.maxFrameRate = in.readInt();
} }
/** /**
@ -832,6 +853,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
&& viewportHeight == other.viewportHeight && viewportHeight == other.viewportHeight
&& maxVideoBitrate == other.maxVideoBitrate && maxVideoBitrate == other.maxVideoBitrate
&& tunnelingAudioSessionId == other.tunnelingAudioSessionId && tunnelingAudioSessionId == other.tunnelingAudioSessionId
&& maxFrameRate == other.maxFrameRate
&& TextUtils.equals(preferredAudioLanguage, other.preferredAudioLanguage) && TextUtils.equals(preferredAudioLanguage, other.preferredAudioLanguage)
&& TextUtils.equals(preferredTextLanguage, other.preferredTextLanguage) && TextUtils.equals(preferredTextLanguage, other.preferredTextLanguage)
&& areRendererDisabledFlagsEqual(rendererDisabledFlags, other.rendererDisabledFlags) && areRendererDisabledFlagsEqual(rendererDisabledFlags, other.rendererDisabledFlags)
@ -855,6 +877,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
result = 31 * result + viewportHeight; result = 31 * result + viewportHeight;
result = 31 * result + maxVideoBitrate; result = 31 * result + maxVideoBitrate;
result = 31 * result + tunnelingAudioSessionId; result = 31 * result + tunnelingAudioSessionId;
result = 31 * result + maxFrameRate;
result = result =
31 * result + (preferredAudioLanguage == null ? 0 : preferredAudioLanguage.hashCode()); 31 * result + (preferredAudioLanguage == null ? 0 : preferredAudioLanguage.hashCode());
result = 31 * result + (preferredTextLanguage == null ? 0 : preferredTextLanguage.hashCode()); result = 31 * result + (preferredTextLanguage == null ? 0 : preferredTextLanguage.hashCode());
@ -889,6 +912,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
dest.writeInt(viewportHeight); dest.writeInt(viewportHeight);
Util.writeBoolean(dest, viewportOrientationMayChange); Util.writeBoolean(dest, viewportOrientationMayChange);
dest.writeInt(tunnelingAudioSessionId); dest.writeInt(tunnelingAudioSessionId);
dest.writeInt(maxFrameRate);
} }
public static final Parcelable.Creator<Parameters> CREATOR = public static final Parcelable.Creator<Parameters> CREATOR =
@ -1435,7 +1459,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
TrackGroup group = groups.get(i); TrackGroup group = groups.get(i);
int[] adaptiveTracks = getAdaptiveVideoTracksForGroup(group, formatSupport[i], int[] adaptiveTracks = getAdaptiveVideoTracksForGroup(group, formatSupport[i],
allowMixedMimeTypes, requiredAdaptiveSupport, params.maxVideoWidth, params.maxVideoHeight, allowMixedMimeTypes, requiredAdaptiveSupport, params.maxVideoWidth, params.maxVideoHeight,
params.maxVideoBitrate, params.viewportWidth, params.viewportHeight, params.maxVideoBitrate, params.maxFrameRate, params.viewportWidth, params.viewportHeight,
params.viewportOrientationMayChange); params.viewportOrientationMayChange);
if (adaptiveTracks.length > 0) { if (adaptiveTracks.length > 0) {
return Assertions.checkNotNull(adaptiveTrackSelectionFactory) return Assertions.checkNotNull(adaptiveTrackSelectionFactory)
@ -1447,8 +1471,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
private static int[] getAdaptiveVideoTracksForGroup(TrackGroup group, int[] formatSupport, private static int[] getAdaptiveVideoTracksForGroup(TrackGroup group, int[] formatSupport,
boolean allowMixedMimeTypes, int requiredAdaptiveSupport, int maxVideoWidth, boolean allowMixedMimeTypes, int requiredAdaptiveSupport, int maxVideoWidth,
int maxVideoHeight, int maxVideoBitrate, int viewportWidth, int viewportHeight, int maxVideoHeight, int maxVideoBitrate, int maxFrameRate, int viewportWidth,
boolean viewportOrientationMayChange) { int viewportHeight, boolean viewportOrientationMayChange) {
if (group.length < 2) { if (group.length < 2) {
return NO_TRACKS; return NO_TRACKS;
} }
@ -1470,7 +1494,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
if (seenMimeTypes.add(sampleMimeType)) { if (seenMimeTypes.add(sampleMimeType)) {
int countForMimeType = getAdaptiveVideoTrackCountForMimeType(group, formatSupport, int countForMimeType = getAdaptiveVideoTrackCountForMimeType(group, formatSupport,
requiredAdaptiveSupport, sampleMimeType, maxVideoWidth, maxVideoHeight, requiredAdaptiveSupport, sampleMimeType, maxVideoWidth, maxVideoHeight,
maxVideoBitrate, selectedTrackIndices); maxVideoBitrate, maxFrameRate, selectedTrackIndices);
if (countForMimeType > selectedMimeTypeTrackCount) { if (countForMimeType > selectedMimeTypeTrackCount) {
selectedMimeType = sampleMimeType; selectedMimeType = sampleMimeType;
selectedMimeTypeTrackCount = countForMimeType; selectedMimeTypeTrackCount = countForMimeType;
@ -1481,7 +1505,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
// Filter by the selected mime type. // Filter by the selected mime type.
filterAdaptiveVideoTrackCountForMimeType(group, formatSupport, requiredAdaptiveSupport, filterAdaptiveVideoTrackCountForMimeType(group, formatSupport, requiredAdaptiveSupport,
selectedMimeType, maxVideoWidth, maxVideoHeight, maxVideoBitrate, selectedTrackIndices); selectedMimeType, maxVideoWidth, maxVideoHeight, maxVideoBitrate, maxFrameRate,
selectedTrackIndices);
return selectedTrackIndices.size() < 2 ? NO_TRACKS : Util.toArray(selectedTrackIndices); return selectedTrackIndices.size() < 2 ? NO_TRACKS : Util.toArray(selectedTrackIndices);
} }
@ -1494,13 +1519,14 @@ public class DefaultTrackSelector extends MappingTrackSelector {
int maxVideoWidth, int maxVideoWidth,
int maxVideoHeight, int maxVideoHeight,
int maxVideoBitrate, int maxVideoBitrate,
int maxFrameRate,
List<Integer> selectedTrackIndices) { List<Integer> selectedTrackIndices) {
int adaptiveTrackCount = 0; int adaptiveTrackCount = 0;
for (int i = 0; i < selectedTrackIndices.size(); i++) { for (int i = 0; i < selectedTrackIndices.size(); i++) {
int trackIndex = selectedTrackIndices.get(i); int trackIndex = selectedTrackIndices.get(i);
if (isSupportedAdaptiveVideoTrack(group.getFormat(trackIndex), mimeType, if (isSupportedAdaptiveVideoTrack(group.getFormat(trackIndex), mimeType,
formatSupport[trackIndex], requiredAdaptiveSupport, maxVideoWidth, maxVideoHeight, formatSupport[trackIndex], requiredAdaptiveSupport, maxVideoWidth, maxVideoHeight,
maxVideoBitrate)) { maxVideoBitrate, maxFrameRate)) {
adaptiveTrackCount++; adaptiveTrackCount++;
} }
} }
@ -1515,12 +1541,13 @@ public class DefaultTrackSelector extends MappingTrackSelector {
int maxVideoWidth, int maxVideoWidth,
int maxVideoHeight, int maxVideoHeight,
int maxVideoBitrate, int maxVideoBitrate,
int maxFrameRate,
List<Integer> selectedTrackIndices) { List<Integer> selectedTrackIndices) {
for (int i = selectedTrackIndices.size() - 1; i >= 0; i--) { for (int i = selectedTrackIndices.size() - 1; i >= 0; i--) {
int trackIndex = selectedTrackIndices.get(i); int trackIndex = selectedTrackIndices.get(i);
if (!isSupportedAdaptiveVideoTrack(group.getFormat(trackIndex), mimeType, if (!isSupportedAdaptiveVideoTrack(group.getFormat(trackIndex), mimeType,
formatSupport[trackIndex], requiredAdaptiveSupport, maxVideoWidth, maxVideoHeight, formatSupport[trackIndex], requiredAdaptiveSupport, maxVideoWidth, maxVideoHeight,
maxVideoBitrate)) { maxVideoBitrate, maxFrameRate)) {
selectedTrackIndices.remove(i); selectedTrackIndices.remove(i);
} }
} }
@ -1533,12 +1560,14 @@ public class DefaultTrackSelector extends MappingTrackSelector {
int requiredAdaptiveSupport, int requiredAdaptiveSupport,
int maxVideoWidth, int maxVideoWidth,
int maxVideoHeight, int maxVideoHeight,
int maxVideoBitrate) { int maxVideoBitrate,
int maxFrameRate) {
return isSupported(formatSupport, false) && ((formatSupport & requiredAdaptiveSupport) != 0) return isSupported(formatSupport, false) && ((formatSupport & requiredAdaptiveSupport) != 0)
&& (mimeType == null || Util.areEqual(format.sampleMimeType, mimeType)) && (mimeType == null || Util.areEqual(format.sampleMimeType, mimeType))
&& (format.width == Format.NO_VALUE || format.width <= maxVideoWidth) && (format.width == Format.NO_VALUE || format.width <= maxVideoWidth)
&& (format.height == Format.NO_VALUE || format.height <= maxVideoHeight) && (format.height == Format.NO_VALUE || format.height <= maxVideoHeight)
&& (format.bitrate == Format.NO_VALUE || format.bitrate <= maxVideoBitrate); && (format.bitrate == Format.NO_VALUE || format.bitrate <= maxVideoBitrate)
&& (format.frameRate == Format.NO_VALUE || format.frameRate <= maxFrameRate);
} }
private static @Nullable TrackSelection selectFixedVideoTrack( private static @Nullable TrackSelection selectFixedVideoTrack(
@ -1560,7 +1589,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
boolean isWithinConstraints = selectedTrackIndices.contains(trackIndex) boolean isWithinConstraints = selectedTrackIndices.contains(trackIndex)
&& (format.width == Format.NO_VALUE || format.width <= params.maxVideoWidth) && (format.width == Format.NO_VALUE || format.width <= params.maxVideoWidth)
&& (format.height == Format.NO_VALUE || format.height <= params.maxVideoHeight) && (format.height == Format.NO_VALUE || format.height <= params.maxVideoHeight)
&& (format.bitrate == Format.NO_VALUE || format.bitrate <= params.maxVideoBitrate); && (format.bitrate == Format.NO_VALUE || format.bitrate <= params.maxVideoBitrate)
&& (format.frameRate == Format.NO_VALUE || format.frameRate <= params.maxFrameRate);
if (!isWithinConstraints && !params.exceedVideoConstraintsIfNecessary) { if (!isWithinConstraints && !params.exceedVideoConstraintsIfNecessary) {
// Track should not be selected. // Track should not be selected.
continue; continue;

3
library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
View File

@ -136,7 +136,8 @@ public final class DefaultTrackSelectorTest {
/* viewportWidth= */ 4, /* viewportWidth= */ 4,
/* viewportHeight= */ 5, /* viewportHeight= */ 5,
/* viewportOrientationMayChange= */ false, /* viewportOrientationMayChange= */ false,
/* tunnelingAudioSessionId= */ C.AUDIO_SESSION_ID_UNSET); /* tunnelingAudioSessionId= */ C.AUDIO_SESSION_ID_UNSET,
/* maxFrameRate= */ 6);
Parcel parcel = Parcel.obtain(); Parcel parcel = Parcel.obtain();
parametersToParcel.writeToParcel(parcel, 0); parametersToParcel.writeToParcel(parcel, 0);