Skip to content

fix(DRM): Fix drm choice when the user provide a server in the manifest #8067

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

Merged
avelad merged 3 commits into from
Feb 12, 2025
Merged

fix(DRM): Fix drm choice when the user provide a server in the manifest #8067

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83c0ccd
fix(DRM): Fix drm choice when the user provide a server in the manifest
avelad Feb 12, 2025
f21e6d2
Optimization
avelad Feb 12, 2025
88f33b8
Fix
avelad Feb 12, 2025
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
12 changes: 11 additions & 1 deletion lib/drm/drm_engine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1083,7 +1083,17 @@ shaka.drm.DrmEngine = class {

// If we have configured preferredKeySystems, choose a preferred keySystem
// if available.
for (const preferredKeySystem of this.config_.preferredKeySystems) {
let preferredKeySystems = this.config_.preferredKeySystems;
if (!preferredKeySystems.length) {
// If there is no preference set and we only have one license server, we
// use this as preference. This is used to override manifests on those
// that have the embedded license and the browser supports multiple DRMs.
const servers = shaka.util.MapUtils.asMap(this.config_.servers);
if (servers.size == 1) {
preferredKeySystems = servers.keys();
}
}
for (const preferredKeySystem of preferredKeySystems) {
for (const variant of variants) {
const decodingInfo = variant.decodingInfos.find((decodingInfo) => {
return decodingInfo.supported &&
Expand Down