loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No-op cleanup of DashTimeline

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=204451894
This commit is contained in:
olly 2018-07-13 04:06:52 -07:00 committed by Oliver Woodman
parent 18ab4b9112
commit cba6da8906
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
View File

@ -1083,10 +1083,9 @@ public final class DashMediaSource extends BaseMediaSource {
@Override @Override
public Period getPeriod(int periodIndex, Period period, boolean setIdentifiers) { public Period getPeriod(int periodIndex, Period period, boolean setIdentifiers) {
Assertions.checkIndex(periodIndex, 0, manifest.getPeriodCount()); Assertions.checkIndex(periodIndex, 0, getPeriodCount());
Object id = setIdentifiers ? manifest.getPeriod(periodIndex).id : null; Object id = setIdentifiers ? manifest.getPeriod(periodIndex).id : null;
Object uid = setIdentifiers ? firstPeriodId Object uid = setIdentifiers ? (firstPeriodId + periodIndex) : null;
+ Assertions.checkIndex(periodIndex, 0, manifest.getPeriodCount()) : null;
return period.set(id, uid, 0, manifest.getPeriodDurationUs(periodIndex), return period.set(id, uid, 0, manifest.getPeriodDurationUs(periodIndex),
C.msToUs(manifest.getPeriod(periodIndex).startMs - manifest.getPeriod(0).startMs) C.msToUs(manifest.getPeriod(periodIndex).startMs - manifest.getPeriod(0).startMs)
- offsetInFirstPeriodUs); - offsetInFirstPeriodUs);
@ -1113,7 +1112,7 @@ public final class DashMediaSource extends BaseMediaSource {
windowDefaultStartPositionUs, windowDefaultStartPositionUs,
windowDurationUs, windowDurationUs,
/* firstPeriodIndex= */ 0, /* firstPeriodIndex= */ 0,
manifest.getPeriodCount() - 1, /* lastPeriodIndex= */ getPeriodCount() - 1,
offsetInFirstPeriodUs); offsetInFirstPeriodUs);
} }
@ -1123,8 +1122,8 @@ public final class DashMediaSource extends BaseMediaSource {
return C.INDEX_UNSET; return C.INDEX_UNSET;
} }
int periodId = (int) uid; int periodId = (int) uid;
return periodId < firstPeriodId || periodId >= firstPeriodId + getPeriodCount() int periodIndex = periodId - firstPeriodId;
? C.INDEX_UNSET : (periodId - firstPeriodId); return periodIndex < 0 || periodIndex >= getPeriodCount() ? C.INDEX_UNSET : periodIndex;
} }
private long getAdjustedWindowDefaultStartPositionUs(long defaultPositionProjectionUs) { private long getAdjustedWindowDefaultStartPositionUs(long defaultPositionProjectionUs) {