From 1d046d5da8c0eb1cadfa42420dd46fad83c2db6a Mon Sep 17 00:00:00 2001 From: tonihei Date: Tue, 18 Jul 2017 03:08:51 -0700 Subject: [PATCH] Fix chunk count bug in FakeAdaptiveDataSet. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=162331762 --- .../android/exoplayer2/testutil/FakeAdaptiveDataSet.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSet.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSet.java index 961da2c9dd..f4476ddf93 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSet.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSet.java @@ -42,6 +42,7 @@ public final class FakeAdaptiveDataSet extends FakeDataSet { } + private final long chunkCount; private final long chunkDurationUs; private final long lastChunkDurationUs; @@ -66,6 +67,11 @@ public final class FakeAdaptiveDataSet extends FakeDataSet { } } this.lastChunkDurationUs = lastChunkDurationUs == 0 ? chunkDurationUs : lastChunkDurationUs; + this.chunkCount = lastChunkDurationUs == 0 ? fullChunks : fullChunks + 1; + } + + public long getChunkCount() { + return chunkCount; } public String getUri(int trackSelectionIndex) { @@ -73,7 +79,7 @@ public final class FakeAdaptiveDataSet extends FakeDataSet { } public long getChunkDuration(int chunkIndex) { - return chunkIndex == getAllData().size() - 1 ? lastChunkDurationUs : chunkDurationUs; + return chunkIndex == getChunkCount() - 1 ? lastChunkDurationUs : chunkDurationUs; } public long getStartTime(int chunkIndex) {