Commit 64cd4383 by Steve Mayhew

Default to not select iFrame oly tracks.

Pull in change to default to not use i-Frames for base AdaptiveTrackSelection.
The expectation is a subclases, that support transitioning to iFrame, will select these tracks.
parent 33667ebc
......@@ -541,16 +541,10 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
protected boolean canSelectFormat(
Format format, int trackBitrate, float playbackSpeed, long effectiveBitrate) {
boolean isIframeOnly = (format.roleFlags & C.ROLE_FLAG_TRICK_PLAY) != 0;
boolean isNonIframeOnly = (format.roleFlags & C.ROLE_FLAG_TRICK_PLAY) == 0;
boolean canSelect = Math.round(trackBitrate * playbackSpeed) <= effectiveBitrate;
if (Math.abs(playbackSpeed) > 6.0f) {
canSelect = isIframeOnly; // TODO factor in playback speed...
} else {
canSelect = ! isIframeOnly && canSelect;
}
return canSelect;
return canSelect && isNonIframeOnly; // Default is not to use the IDR only tracks in selection
}
/**
......
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