Skip to content

Commit

Permalink
fix(DASH): Fix HTTP redirect during manifest update (#7339)
Browse files Browse the repository at this point in the history
Fixes #7323
  • Loading branch information
avelad committed Sep 18, 2024
1 parent c76b145 commit 5ba69b1
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions lib/dash/dash_parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,9 @@ shaka.dash.DashParser = class {

/** @private {boolean} */
this.isTransitionFromDynamicToStatic_ = false;

/** @private {?Array.<string>} */
this.lastCalculatedBaseUris_ = [];
}

/**
Expand Down Expand Up @@ -586,7 +589,6 @@ shaka.dash.DashParser = class {
}

const uriObjs = TXml.findChildren(mpd, 'BaseURL');
let calculatedBaseUris;
let someLocationValid = false;
if (this.contentSteeringManager_) {
for (const uriObj of uriObjs) {
Expand All @@ -599,18 +601,19 @@ shaka.dash.DashParser = class {
}
}
}
this.lastCalculatedBaseUris_ = null;
if (!someLocationValid || !this.contentSteeringManager_) {
const uris = uriObjs.map(TXml.getContents);
calculatedBaseUris = shaka.util.ManifestParserUtils.resolveUris(
this.lastCalculatedBaseUris_ = shaka.util.ManifestParserUtils.resolveUris(
manifestBaseUris, uris);
}

const getBaseUris = () => {
if (this.contentSteeringManager_ && someLocationValid) {
return this.contentSteeringManager_.getLocations('BaseURL');
}
if (calculatedBaseUris) {
return calculatedBaseUris;
if (this.lastCalculatedBaseUris_) {
return this.lastCalculatedBaseUris_;
}
return [];
};
Expand Down

0 comments on commit 5ba69b1

Please sign in to comment.