From 6a9f125c149a93851aa970cd762fb837814a41b4 Mon Sep 17 00:00:00 2001 From: tonihei Date: Tue, 22 Sep 2020 09:43:23 +0100 Subject: [PATCH] Don't assume FakeSampleStream is ended without end of stream signal PiperOrigin-RevId: 333029935 --- .../android/exoplayer2/testutil/FakeSampleStream.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSampleStream.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSampleStream.java index 7d63e129db..4f4aee9675 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSampleStream.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSampleStream.java @@ -190,7 +190,12 @@ public class FakeSampleStream implements SampleStream { } } sampleItemIndex = fakeSampleStreamItems.size(); - readEOSBuffer = true; + if (!fakeSampleStreamItems.isEmpty()) { + FakeSampleStreamItem lastItem = Iterables.getLast(fakeSampleStreamItems); + readEOSBuffer = + lastItem.sampleInfo != null + && ((lastItem.sampleInfo.flags & C.BUFFER_FLAG_END_OF_STREAM) != 0); + } } /**