Commit 15a1f9a5 by andrewlewis Committed by Oliver Woodman

Remove DefaultLoadControl buffer time state

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=176515168
parent e619079a
...@@ -51,10 +51,6 @@ public class DefaultLoadControl implements LoadControl { ...@@ -51,10 +51,6 @@ public class DefaultLoadControl implements LoadControl {
*/ */
public static final int DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS = 5000; public static final int DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS = 5000;
private static final int ABOVE_HIGH_WATERMARK = 0;
private static final int BETWEEN_WATERMARKS = 1;
private static final int BELOW_LOW_WATERMARK = 2;
private final DefaultAllocator allocator; private final DefaultAllocator allocator;
private final long minBufferUs; private final long minBufferUs;
...@@ -182,11 +178,11 @@ public class DefaultLoadControl implements LoadControl { ...@@ -182,11 +178,11 @@ public class DefaultLoadControl implements LoadControl {
@Override @Override
public boolean shouldContinueLoading(long bufferedDurationUs, float playbackSpeed) { public boolean shouldContinueLoading(long bufferedDurationUs, float playbackSpeed) {
int bufferTimeState = getBufferTimeState(bufferedDurationUs);
boolean targetBufferSizeReached = allocator.getTotalBytesAllocated() >= targetBufferSize; boolean targetBufferSizeReached = allocator.getTotalBytesAllocated() >= targetBufferSize;
boolean wasBuffering = isBuffering; boolean wasBuffering = isBuffering;
isBuffering = bufferTimeState == BELOW_LOW_WATERMARK isBuffering = bufferedDurationUs < minBufferUs // below low watermark
|| (bufferTimeState == BETWEEN_WATERMARKS && isBuffering && !targetBufferSizeReached); || (bufferedDurationUs <= maxBufferUs // between watermarks
&& isBuffering && !targetBufferSizeReached);
if (priorityTaskManager != null && isBuffering != wasBuffering) { if (priorityTaskManager != null && isBuffering != wasBuffering) {
if (isBuffering) { if (isBuffering) {
priorityTaskManager.add(C.PRIORITY_PLAYBACK); priorityTaskManager.add(C.PRIORITY_PLAYBACK);
...@@ -197,11 +193,6 @@ public class DefaultLoadControl implements LoadControl { ...@@ -197,11 +193,6 @@ public class DefaultLoadControl implements LoadControl {
return isBuffering; return isBuffering;
} }
private int getBufferTimeState(long bufferedDurationUs) {
return bufferedDurationUs > maxBufferUs ? ABOVE_HIGH_WATERMARK
: (bufferedDurationUs < minBufferUs ? BELOW_LOW_WATERMARK : BETWEEN_WATERMARKS);
}
private void reset(boolean resetAllocator) { private void reset(boolean resetAllocator) {
targetBufferSize = 0; targetBufferSize = 0;
if (priorityTaskManager != null && isBuffering) { if (priorityTaskManager != null && isBuffering) {
......
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