Commit d890c2f4 by olly Committed by Oliver Woodman

Fix infinite loop -> ANR at end of HLS playbacks

continueLoading shouldn't return true unless it's done
something. Always returning true if endOfStream was
causing CompositeSequenceableLoader.continueLoading to
loop forever.

It looks like the same issue exists in ChunkSampleStream
as well, although I can't seem to provoke DASH or SS
playbacks into doing anything bad as a result.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=139559834
parent 35054f8f
...@@ -251,7 +251,7 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S ...@@ -251,7 +251,7 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
@Override @Override
public boolean continueLoading(long positionUs) { public boolean continueLoading(long positionUs) {
if (loader.isLoading()) { if (loadingFinished || loader.isLoading()) {
return false; return false;
} }
......
...@@ -329,7 +329,7 @@ import java.util.LinkedList; ...@@ -329,7 +329,7 @@ import java.util.LinkedList;
@Override @Override
public boolean continueLoading(long positionUs) { public boolean continueLoading(long positionUs) {
if (loader.isLoading()) { if (loadingFinished || loader.isLoading()) {
return false; return false;
} }
......
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