Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

stick to new dash manifest uri after http 302 redirection #7064

Merged
merged 3 commits into from
Mar 11, 2020
Merged

stick to new dash manifest uri after http 302 redirection #7064

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
087c6e0
stick to new dash manifest uri after http 302 redirection
davibe Mar 6, 2020
ca70b10
DASHMediaSource: ensure MPD.Location is applied in also case of http …
davibe Mar 9, 2020
8908cc8
DASHMediaSource: avoid potentially locking twice
davibe Mar 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,14 +791,21 @@ protected void releaseSourceInternal() {
manifestLoadPending &= manifest.dynamic;
manifestLoadStartTimestampMs = elapsedRealtimeMs - loadDurationMs;
manifestLoadEndTimestampMs = elapsedRealtimeMs;
if (manifest.location != null) {
boolean isRedirect = !loadable.getUri().equals(this.manifestUri);
boolean hasLocation = manifest.location != null;

if (isRedirect || hasLocation) {
synchronized (manifestUriLock) {
// This condition checks that replaceManifestUri wasn't called between the start and end of
// this load. If it was, we ignore the manifest location and prefer the manual replacement.
@SuppressWarnings("ReferenceEquality")
boolean isSameUriInstance = loadable.dataSpec.uri == manifestUri;
if (isSameUriInstance) {
manifestUri = manifest.location;
if (hasLocation) {
manifestUri = manifest.location;
} else {
manifestUri = loadable.getUri();
}
}
}
}
Expand Down