Skip to content

Bugfix: PIPELINE_DECODE_ERROR when switching from Clear to DRM content #4236

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

Closed
wants to merge 3 commits into from
Closed

Bugfix: PIPELINE_DECODE_ERROR when switching from Clear to DRM content #4236

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
318d048
fix: transition from Clear to DRM content
Aug 9, 2021
38023e5
Merge branch 'master' into bugfix/Transition-from-Clear-to-DRM-content
hongfeih-es Aug 13, 2021
f7e5fa4
fix: Set mediaKeys again after media attached
Jan 11, 2022
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
13 changes: 12 additions & 1 deletion src/controller/eme-controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@ class EMEController implements ComponentAPI {
private mediaKeysPromise: Promise<MediaKeys> | null = null;
private _onMediaEncrypted = this.onMediaEncrypted.bind(this);

// try to call setMediaKeys again after media attached if needed
private _attemptSetMediaKeysAgain: boolean = false;

/**
* @constructs
* @param {Hls} hls Our Hls.js instance
Expand Down Expand Up @@ -254,6 +257,7 @@ class EMEController implements ComponentAPI {
logger.log(`Media-keys created for key-system "${keySystem}"`);

this._onMediaKeysCreated();
this._attemptSetMediaKeys(mediaKeys);

return mediaKeys;
});
Expand Down Expand Up @@ -358,9 +362,11 @@ class EMEController implements ComponentAPI {
*/
private _attemptSetMediaKeys(mediaKeys?: MediaKeys) {
if (!this._media) {
throw new Error(
logger.warn(
'Attempted to set mediaKeys without first attaching a media element'
);
this._attemptSetMediaKeysAgain = true;
return;
}

if (!this._hasSetMediaKeys) {
Expand Down Expand Up @@ -653,6 +659,11 @@ class EMEController implements ComponentAPI {
// keep reference of media
this._media = media;

if (this._attemptSetMediaKeysAgain) {
// mediaKeys not set, attempt again
this._attemptSetMediaKeys();
}

media.addEventListener('encrypted', this._onMediaEncrypted);
}

Expand Down